src/share/vm/c1/c1_IR.cpp

*** 216,225 ****
--- 216,242 ----
    _scope_debug_info->record_debug_info(recorder, pc_offset, true/*topmost*/, _is_method_handle_invoke);
    recorder->end_safepoint(pc_offset);
  }
  
  
+ void CodeEmitInfo::record_non_safepoint_debug_info(DebugInformationRecorder* recorder, int pc_offset) {
+   if (recorder->recording_non_safepoints()) {
+     recorder->add_non_safepoint(pc_offset);
+     record_scope_non_safepoint_debug_info(recorder, pc_offset, scope(), stack());
+     recorder->end_non_safepoint(pc_offset);
+   }
+ }
+ 
+ 
+ void CodeEmitInfo::record_scope_non_safepoint_debug_info(DebugInformationRecorder* recorder, int pc_offset, IRScope *scope, ValueStack *state) {
+   if (scope->caller() != NULL) {
+     record_scope_non_safepoint_debug_info(recorder, pc_offset, scope->caller(), state->caller_state());
+   }
+   recorder->describe_scope(pc_offset, scope->method(), state->bci(), false);
+ }
+ 
+ 
  void CodeEmitInfo::add_register_oop(LIR_Opr opr) {
    assert(_oop_map != NULL, "oop map must already exist");
    assert(opr->is_single_cpu(), "should not call otherwise");
  
    VMReg name = frame_map()->regname(opr);