src/share/vm/runtime/arguments.cpp

rev 5968 : 8031320: Use Intel RTM instructions for locks
Summary: Use RTM for inflated locks and stack locks.
Reviewed-by: iveresov, twisti, roland, dcubed

*** 3746,3758 ****
    LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedOops, false));
    LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedClassPointers, false));
  #endif // CC_INTERP
  
  #ifdef COMPILER2
-   if (!UseBiasedLocking || EmitSync != 0) {
-     UseOptoBiasInlining = false;
-   }
    if (!EliminateLocks) {
      EliminateNestedLocks = false;
    }
    if (!Inline) {
      IncrementalInline = false;
--- 3746,3755 ----
*** 3819,3828 ****
--- 3816,3830 ----
      CommandLineFlags::wasSetOnCmdline("PauseAtExit", &set);
      if (!set) {
        FLAG_SET_DEFAULT(PauseAtExit, true);
      }
    }
+ #ifdef COMPILER2
+   if (!UseBiasedLocking || EmitSync != 0) {
+     UseOptoBiasInlining = false;
+   }
+ #endif
  
    return JNI_OK;
  }
  
  jint Arguments::adjust_after_os() {