Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/arguments.cpp @ 2335:0cd0a06d2535
Merge
author | acorn |
---|---|
date | Mon, 07 Mar 2011 09:16:08 -0800 |
parents | 8c9c9ee30d71 9f44e9aad2d9 |
children | 799d8ccf63cf |
comparison
equal
deleted
inserted
replaced
2327:3c76374706ea | 2335:0cd0a06d2535 |
---|---|
3108 set_aggressive_opts_flags(); | 3108 set_aggressive_opts_flags(); |
3109 | 3109 |
3110 // Turn off biased locking for locking debug mode flags, | 3110 // Turn off biased locking for locking debug mode flags, |
3111 // which are subtlely different from each other but neither works with | 3111 // which are subtlely different from each other but neither works with |
3112 // biased locking. | 3112 // biased locking. |
3113 if (!UseFastLocking || UseHeavyMonitors) { | 3113 if (UseHeavyMonitors |
3114 #ifdef COMPILER1 | |
3115 || !UseFastLocking | |
3116 #endif // COMPILER1 | |
3117 ) { | |
3114 if (!FLAG_IS_DEFAULT(UseBiasedLocking) && UseBiasedLocking) { | 3118 if (!FLAG_IS_DEFAULT(UseBiasedLocking) && UseBiasedLocking) { |
3115 // flag set to true on command line; warn the user that they | 3119 // flag set to true on command line; warn the user that they |
3116 // can't enable biased locking here | 3120 // can't enable biased locking here |
3117 warning("Biased Locking is not supported with locking debug flags" | 3121 warning("Biased Locking is not supported with locking debug flags" |
3118 "; ignoring UseBiasedLocking flag." ); | 3122 "; ignoring UseBiasedLocking flag." ); |