--- old/src/cpu/x86/vm/c1_CodeStubs_x86.cpp	2016-10-25 10:40:01.884772704 +0200
+++ new/src/cpu/x86/vm/c1_CodeStubs_x86.cpp	2016-10-25 10:40:01.837772673 +0200
@@ -228,9 +228,8 @@
 // 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);
 }
 
 
@@ -267,6 +266,9 @@
     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);
 }