src/hotspot/share/c1/c1_Runtime1.cpp

@@ -697,15 +697,15 @@
  JRT_END
  
  
  JRT_BLOCK_ENTRY(void, Runtime1::monitorenter(JavaThread* current, oopDesc* obj, BasicObjectLock* lock))
    NOT_PRODUCT(_monitorenter_slowcase_cnt++;)
-   if (!UseFastLocking) {
+   if (LockingMode == LM_MONITOR) {
      lock->set_obj(obj);
    }
-   assert(obj == lock->obj(), "must match");
-   SharedRuntime::monitor_enter_helper(obj, lock->lock(), current);
+   assert(LockingMode == LM_LIGHTWEIGHT || obj == lock->obj(), "must match");
+   SharedRuntime::monitor_enter_helper(obj, LockingMode == LM_LIGHTWEIGHT ? NULL : lock->lock(), current);
  JRT_END
  
  
  JRT_LEAF(void, Runtime1::monitorexit(JavaThread* current, BasicObjectLock* lock))
    NOT_PRODUCT(_monitorexit_slowcase_cnt++;)