Fix for issue 14790 - Crash when using dartium devtools

runtime/vm/assembler_x64.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/assembler.h"
 #include "vm/heap.h"
 #include "vm/memory_region.h"
@@ skipping 2649 matching lines @@
   }
 }
 
 
 void Assembler::LeaveFrame() {
   movq(RSP, RBP);
   popq(RBP);
 }
 
 
-void Assembler::LeaveFrameWithPP() {
-  movq(PP, Address(RBP, -2 * kWordSize));
-  LeaveFrame();
-}
-
-
 void Assembler::ReturnPatchable() {
   // This sequence must have a fixed size so that it can be patched by the
   // debugger.
   intptr_t start = buffer_.GetPosition();
-  LeaveFrameWithPP();
+  LeaveDartFrame();
   ret();
   nop(4);
   ASSERT((buffer_.GetPosition() - start) == 13);
 }
 
 
 void Assembler::ReserveAlignedFrameSpace(intptr_t frame_space) {
   // Reserve space for arguments and align frame before entering
   // the C++ world.
   if (frame_space != 0) {
@@ skipping 127 matching lines @@
     pushq(new_pc);
     pushq(PP);
     movq(PP, new_pp);
     if (frame_size != 0) {
       subq(RSP, Immediate(frame_size));
     }
   }
 }
 
 
+void Assembler::LeaveDartFrame() {
+  // Restore caller's PP register that was pushed in EnterDartFrame.
+  movq(PP, Address(RBP, (kSavedCallerPpSlotFromFp * kWordSize)));
+  LeaveFrame();
+}
+
+
 // On entry to a function compiled for OSR, the caller's frame pointer, the
 // stack locals, and any copied parameters are already in place.  The frame
 // pointer is already set up.  The PC marker is not correct for the
 // optimized function and there may be extra space for spill slots to
 // allocate.
 void Assembler::EnterOsrFrame(intptr_t extra_size,
                               Register new_pp, Register new_pc) {
   if (new_pc == kNoRegister) {
     Label dart_entry;
     call(&dart_entry);
@@ skipping 17 matching lines @@
   } else {
     movq(Address(RBP, kPcMarkerSlotFromFp * kWordSize), new_pc);
     movq(PP, new_pp);
   }
   if (extra_size != 0) {
     subq(RSP, Immediate(extra_size));
   }
 }
 
 
-void Assembler::EnterStubFrame() {
+void Assembler::EnterStubFrame(bool load_pp) {
   EnterFrame(0);
   pushq(Immediate(0));  // Push 0 in the saved PC area for stub frames.
+  pushq(PP);  // Save caller's pool pointer
+  if (load_pp) {
+    LoadPoolPointer(PP);
+  }
 }
 
 
-void Assembler::EnterStubFrameWithPP() {
-  EnterFrame(0);
-  pushq(Immediate(0));  // Push 0 in the saved PC area for stub frames.
-  pushq(PP);  // Save caller's pool pointer
-  LoadPoolPointer(PP);
+void Assembler::LeaveStubFrame() {
+  // Restore caller's PP register that was pushed in EnterStubFrame.
+  movq(PP, Address(RBP, (kSavedCallerPpSlotFromFp * kWordSize)));
+  LeaveFrame();
 }
 
 
 void Assembler::TryAllocate(const Class& cls,
                             Label* failure,
                             bool near_jump,
                             Register instance_reg,
                             Register pp) {
   ASSERT(failure != NULL);
   if (FLAG_inline_alloc) {
@@ skipping 210 matching lines @@
 
 
 const char* Assembler::FpuRegisterName(FpuRegister reg) {
   ASSERT((0 <= reg) && (reg < kNumberOfXmmRegisters));
   return xmm_reg_names[reg];
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64