Mercurial > hg > truffle
diff 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 |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Wed Feb 16 17:26:20 2011 -0800 +++ b/src/share/vm/runtime/arguments.cpp Mon Feb 21 04:49:17 2011 -0800 @@ -3103,6 +3103,19 @@ // Set flags if Aggressive optimization flags (-XX:+AggressiveOpts) enabled. set_aggressive_opts_flags(); + // Turn off biased locking for locking debug mode flags, + // which are subtlely different from each other but neither works with + // biased locking. + if (!UseFastLocking || UseHeavyMonitors) { + if (!FLAG_IS_DEFAULT(UseBiasedLocking) && UseBiasedLocking) { + // flag set to true on command line; warn the user that they + // can't enable biased locking here + warning("Biased Locking is not supported with locking debug flags" + "; ignoring UseBiasedLocking flag." ); + } + UseBiasedLocking = false; + } + #ifdef CC_INTERP // Clear flags not supported by the C++ interpreter FLAG_SET_DEFAULT(ProfileInterpreter, false);