Debugger: use debug break slots to break at function exit.

src/assembler.cc

 // Copyright (c) 1994-2006 Sun Microsystems Inc.
 // All Rights Reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 // - Redistributions of source code must retain the above copyright notice,
 // this list of conditions and the following disclaimer.
 //
@@ skipping 729 matching lines @@
     case DEBUGGER_STATEMENT:
       return "debugger statement";
     case CODE_TARGET:
       return "code target";
     case CODE_TARGET_WITH_ID:
       return "code target with id";
     case CELL:
       return "property cell";
     case RUNTIME_ENTRY:
       return "runtime entry";
-    case JS_RETURN:
-      return "js return";
     case COMMENT:
       return "comment";
     case POSITION:
       return "position";
     case STATEMENT_POSITION:
       return "statement position";
     case EXTERNAL_REFERENCE:
       return "external reference";
     case INTERNAL_REFERENCE:
       return "internal reference";
     case INTERNAL_REFERENCE_ENCODED:
       return "encoded internal reference";
     case DEOPT_REASON:
       return "deopt reason";
     case CONST_POOL:
       return "constant pool";
     case VENEER_POOL:
       return "veneer pool";
     case DEBUG_BREAK_SLOT_AT_POSITION:
       return "debug break slot at position";
+    case DEBUG_BREAK_SLOT_AT_RETURN:
+      return "debug break slot at return";
     case DEBUG_BREAK_SLOT_AT_CALL:
       return "debug break slot at call";
     case DEBUG_BREAK_SLOT_AT_CONSTRUCT_CALL:
       return "debug break slot at construct call";
     case CODE_AGE_SEQUENCE:
       return "code age sequence";
     case GENERATOR_CONTINUATION:
       return "generator continuation";
     case NUMBER_OF_MODES:
     case PC_JUMP:
@@ skipping 71 matching lines @@
     case INTERNAL_REFERENCE:
     case INTERNAL_REFERENCE_ENCODED: {
       Address target = target_internal_reference();
       Address pc = target_internal_reference_address();
       Code* code = Code::cast(isolate->FindCodeObject(pc));
       CHECK(target >= code->instruction_start());
       CHECK(target <= code->instruction_end());
       break;
     }
     case RUNTIME_ENTRY:
-    case JS_RETURN:
     case COMMENT:
     case POSITION:
     case STATEMENT_POSITION:
     case EXTERNAL_REFERENCE:
     case DEOPT_REASON:
     case CONST_POOL:
     case VENEER_POOL:
     case DEBUG_BREAK_SLOT_AT_POSITION:
+    case DEBUG_BREAK_SLOT_AT_RETURN:
     case DEBUG_BREAK_SLOT_AT_CALL:
     case DEBUG_BREAK_SLOT_AT_CONSTRUCT_CALL:
     case GENERATOR_CONTINUATION:
     case NONE32:
     case NONE64:
       break;
     case NUMBER_OF_MODES:
     case PC_JUMP:
       UNREACHABLE();
       break;
@@ skipping 917 matching lines @@
 
 
 void Assembler::RecordComment(const char* msg) {
   if (FLAG_code_comments) {
     EnsureSpace ensure_space(this);
     RecordRelocInfo(RelocInfo::COMMENT, reinterpret_cast<intptr_t>(msg));
   }
 }
 
 
-void Assembler::RecordJSReturn() {
-  positions_recorder()->WriteRecordedPositions();
-  EnsureSpace ensure_space(this);
-  RecordRelocInfo(RelocInfo::JS_RETURN);
-}
-
-
 void Assembler::RecordGeneratorContinuation() {
   EnsureSpace ensure_space(this);
   RecordRelocInfo(RelocInfo::GENERATOR_CONTINUATION);
 }
 
 
-void Assembler::RecordDebugBreakSlot() {
+void Assembler::RecordDebugBreakSlot(RelocInfo::Mode mode, int call_argc) {
   EnsureSpace ensure_space(this);
-  RecordRelocInfo(RelocInfo::DEBUG_BREAK_SLOT_AT_POSITION);
+  DCHECK(RelocInfo::IsDebugBreakSlot(mode));
+  intptr_t data = static_cast<intptr_t>(call_argc);
+  RecordRelocInfo(mode, data);
 }
 
 
-void Assembler::RecordDebugBreakSlotForCall(int argc) {
-  EnsureSpace ensure_space(this);
-  intptr_t data = static_cast<intptr_t>(argc);
-  RecordRelocInfo(RelocInfo::DEBUG_BREAK_SLOT_AT_CALL, data);
-}
-
-
-void Assembler::RecordDebugBreakSlotForConstructCall() {
-  EnsureSpace ensure_space(this);
-  RecordRelocInfo(RelocInfo::DEBUG_BREAK_SLOT_AT_CONSTRUCT_CALL);
-}
-
-
 void Assembler::DataAlign(int m) {
   DCHECK(m >= 2 && base::bits::IsPowerOfTwo32(m));
   while ((pc_offset() & (m - 1)) != 0) {
     db(0);
   }
 }
 }  // namespace internal
 }  // namespace v8