src/hotspot/share/c1/c1_Runtime1.cpp

*** 71,10 ***
--- 71,11 ---
  #include "runtime/vframe.inline.hpp"
  #include "runtime/vframeArray.hpp"
  #include "runtime/vm_version.hpp"
  #include "utilities/copy.hpp"
  #include "utilities/events.hpp"
+ #include "utilities/macros.hpp"
  
  
  // Implementation of StubAssembler
  
  StubAssembler::StubAssembler(CodeBuffer* code, const char * name, int stub_id) : C1_MacroAssembler(code) {

*** 755,12 ***
    }
  #endif
    if (LockingMode == LM_MONITOR) {
      lock->set_obj(obj);
    }
!   assert(LockingMode == LM_LIGHTWEIGHT || obj == lock->obj(), "must match");
!   SharedRuntime::monitor_enter_helper(obj, LockingMode == LM_LIGHTWEIGHT ? nullptr : lock->lock(), current);
  JRT_END
  
  
  JRT_LEAF(void, Runtime1::monitorexit(JavaThread* current, BasicObjectLock* lock))
    assert(current == JavaThread::current(), "pre-condition");
--- 756,12 ---
    }
  #endif
    if (LockingMode == LM_MONITOR) {
      lock->set_obj(obj);
    }
!   assert(obj == lock->obj(), "must match: " PTR_FORMAT, p2i(lock));
!   SharedRuntime::monitor_enter_helper(obj, lock->lock(), current);
  JRT_END
  
  
  JRT_LEAF(void, Runtime1::monitorexit(JavaThread* current, BasicObjectLock* lock))
    assert(current == JavaThread::current(), "pre-condition");