A64: Synchronize with r16679.

src/a64/debug-a64.cc

 // Copyright 2013 the V8 project authors. 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.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 48 matching lines @@
   //   ldr ip0, [pc, #(3 * kInstructionSize)]
   //   blr ip0
   //   hlt kHltBadCode    @ code should not return, catch if it does.
   //   <debug break return code ...
   //    ... entry point address (64 bits)>
 
   // The patching code must not overflow the space occupied by the return
   // sequence.
   STATIC_ASSERT(Assembler::kJSRetSequenceInstructions >= 5);
   PatchingAssembler patcher(reinterpret_cast<Instruction*>(rinfo()->pc()), 5);
-  byte* entry = Isolate::Current()->debug()->debug_break_return()->entry();
+  byte* entry =
+      debug_info_->GetIsolate()->debug()->debug_break_return()->entry();
 
   // The first instruction of a patched return sequence must be a load literal
   // loading the address of the debug break return code.
   patcher.LoadLiteral(ip0, 3 * kInstructionSize);
   // TODO(all): check the following is correct.
   // The debug break return code will push a frame and call statically compiled
   // code. By using blr, even though control will not return after the branch,
   // this call site will be registered in the frame (lr being saved as the pc
   // of the next instruction to execute for this frame). The debugger can now
   // iterate on the frames to find call to debug break return code.
@@ skipping 37 matching lines @@
   //    ... entry point address (64 bits)>
 
   // TODO(all): consider adding a hlt instruction after the blr as we don't
   // expect control to return here. This implies increasing
   // kDebugBreakSlotInstructions to 5 instructions.
 
   // The patching code must not overflow the space occupied by the return
   // sequence.
   STATIC_ASSERT(Assembler::kDebugBreakSlotInstructions >= 4);
   PatchingAssembler patcher(reinterpret_cast<Instruction*>(rinfo()->pc()), 4);
-  byte* entry = Isolate::Current()->debug()->debug_break_slot()->entry();
+  byte* entry =
+      debug_info_->GetIsolate()->debug()->debug_break_slot()->entry();
 
   // The first instruction of a patched debug break slot must be a load literal
   // loading the address of the debug break slot code.
   patcher.LoadLiteral(ip0, 2 * kInstructionSize);
   // TODO(all): check the following is correct.
   // The debug break slot code will push a frame and call statically compiled
   // code. By using blr, event hough control will not return after the branch,
   // this call site will be registered in the frame (lr being saved as the pc
   // of the next instruction to execute for this frame). The debugger can now
   // iterate on the frames to find call to debug break slot code.
@@ skipping 242 matching lines @@
   masm->Abort(kLiveEditFrameDroppingIsNotSupportedOnA64);
 }
 
 const bool Debug::kFrameDropperSupported = false;
 
 #endif  // ENABLE_DEBUGGER_SUPPORT
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_A64