Mercurial > hg > truffle
comparison src/share/vm/runtime/arguments.cpp @ 2243:f77b3ec064b0
Merge
author | rottenha |
---|---|
date | Mon, 21 Feb 2011 04:49:17 -0800 |
parents | 59e20a452a2a c08677f98289 |
children | 2ab52cda08e5 da091bb67459 0ac769a57c64 |
comparison
equal
deleted
inserted
replaced
2232:02368ad6c63f | 2243:f77b3ec064b0 |
---|---|
3101 set_bytecode_flags(); | 3101 set_bytecode_flags(); |
3102 | 3102 |
3103 // Set flags if Aggressive optimization flags (-XX:+AggressiveOpts) enabled. | 3103 // Set flags if Aggressive optimization flags (-XX:+AggressiveOpts) enabled. |
3104 set_aggressive_opts_flags(); | 3104 set_aggressive_opts_flags(); |
3105 | 3105 |
3106 // Turn off biased locking for locking debug mode flags, | |
3107 // which are subtlely different from each other but neither works with | |
3108 // biased locking. | |
3109 if (!UseFastLocking || UseHeavyMonitors) { | |
3110 if (!FLAG_IS_DEFAULT(UseBiasedLocking) && UseBiasedLocking) { | |
3111 // flag set to true on command line; warn the user that they | |
3112 // can't enable biased locking here | |
3113 warning("Biased Locking is not supported with locking debug flags" | |
3114 "; ignoring UseBiasedLocking flag." ); | |
3115 } | |
3116 UseBiasedLocking = false; | |
3117 } | |
3118 | |
3106 #ifdef CC_INTERP | 3119 #ifdef CC_INTERP |
3107 // Clear flags not supported by the C++ interpreter | 3120 // Clear flags not supported by the C++ interpreter |
3108 FLAG_SET_DEFAULT(ProfileInterpreter, false); | 3121 FLAG_SET_DEFAULT(ProfileInterpreter, false); |
3109 FLAG_SET_DEFAULT(UseBiasedLocking, false); | 3122 FLAG_SET_DEFAULT(UseBiasedLocking, false); |
3110 LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedOops, false)); | 3123 LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedOops, false)); |