Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/runtime/arguments.cpp	Wed Feb 16 01:42:00 2011 -0500
     1.2 +++ b/src/share/vm/runtime/arguments.cpp	Wed Feb 16 11:34:44 2011 -0500
     1.3 @@ -3103,6 +3103,19 @@
     1.4    // Set flags if Aggressive optimization flags (-XX:+AggressiveOpts) enabled.
     1.5    set_aggressive_opts_flags();
     1.6  
     1.7 +  // Turn off biased locking for locking debug mode flags,
     1.8 +  // which are subtlely different from each other but neither works with
     1.9 +  // biased locking.
    1.10 +  if (!UseFastLocking || UseHeavyMonitors) {
    1.11 +    if (!FLAG_IS_DEFAULT(UseBiasedLocking) && UseBiasedLocking) {
    1.12 +      // flag set to true on command line; warn the user that they
    1.13 +      // can't enable biased locking here
    1.14 +      warning("Biased Locking is not supported with locking debug flags"
    1.15 +              "; ignoring UseBiasedLocking flag." );
    1.16 +    }
    1.17 +    UseBiasedLocking = false;
    1.18 +  }
    1.19 +
    1.20  #ifdef CC_INTERP
    1.21    // Clear flags not supported by the C++ interpreter
    1.22    FLAG_SET_DEFAULT(ProfileInterpreter, false);