--- a/hotspot/src/share/vm/runtime/arguments.cpp	Wed Mar 19 11:37:58 2014 -0700
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Thu Mar 20 17:49:27 2014 -0700
@@ -3782,9 +3782,6 @@
 #endif // CC_INTERP
 
 #ifdef COMPILER2
-  if (!UseBiasedLocking || EmitSync != 0) {
-    UseOptoBiasInlining = false;
-  }
   if (!EliminateLocks) {
     EliminateNestedLocks = false;
   }
@@ -3845,6 +3842,11 @@
       UseBiasedLocking = false;
     }
   }
+#ifdef COMPILER2
+  if (!UseBiasedLocking || EmitSync != 0) {
+    UseOptoBiasInlining = false;
+  }
+#endif
 
   return JNI_OK;
 }