src/cpu/x86/vm/c1_CodeStubs_x86.cpp

@@ -226,13 +226,12 @@
 
 
 // Implementation of MonitorAccessStubs
 
 MonitorEnterStub::MonitorEnterStub(LIR_Opr obj_reg, LIR_Opr lock_reg, CodeEmitInfo* info)
-: MonitorAccessStub(obj_reg, lock_reg)
+: MonitorAccessStub(obj_reg, lock_reg, info)
 {
-  _info = new CodeEmitInfo(info);
 }
 
 
 void MonitorEnterStub::emit_code(LIR_Assembler* ce) {
   assert(__ rsp_offset() == 0, "frame size should be fixed");

@@ -265,10 +264,13 @@
     exit_id = Runtime1::monitorexit_id;
   } else {
     exit_id = Runtime1::monitorexit_nofpu_id;
   }
   __ call(RuntimeAddress(Runtime1::entry_for(exit_id)));
+  if (_info != NULL) {
+    ce->add_non_safepoint_debug_info_here(_info);
+  }
   __ jmp(_continuation);
 }
 
 
 // Implementation of patching: