Fix for issue 14790 - Crash when using dartium devtools

runtime/vm/assembler_x64.h

 // 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.
 
 #ifndef VM_ASSEMBLER_X64_H_
 #define VM_ASSEMBLER_X64_H_
 
 #ifndef VM_ASSEMBLER_H_
 #error Do not include assembler_x64.h directly; use assembler.h instead.
 #endif
@@ skipping 698 matching lines @@
 
   void DoubleAbs(XmmRegister reg);
 
   void LockCmpxchgl(const Address& address, Register reg) {
     lock();
     cmpxchgl(address, reg);
   }
 
   void EnterFrame(intptr_t frame_space);
   void LeaveFrame();
-  void LeaveFrameWithPP();
   void ReturnPatchable();
   void ReserveAlignedFrameSpace(intptr_t frame_space);
 
   // Create a frame for calling into runtime that preserves all volatile
   // registers.  Frame's RSP is guaranteed to be correctly aligned and
   // frame_space bytes are reserved under it.
   void EnterCallRuntimeFrame(intptr_t frame_space);
   void LeaveCallRuntimeFrame();
 
 
@@ skipping 39 matching lines @@
     buffer_.FinalizeInstructions(region);
   }
 
   void LoadPoolPointer(Register pp);
 
   // Set up a Dart frame on entry with a frame pointer and PC information to
   // enable easy access to the RawInstruction object of code corresponding
   // to this frame.
   // The dart frame layout is as follows:
   //   ....
+  //   locals space  <=== RSP
+  //   saved PP
+  //   pc (used to derive the RawInstruction Object of the dart code)
+  //   saved RBP     <=== RBP
   //   ret PC
-  //   saved RBP     <=== RBP
-  //   pc (used to derive the RawInstruction Object of the dart code)
-  //   saved PP
-  //   locals space  <=== RSP
   //   .....
   // This code sets this up with the sequence:
   //   pushq rbp
   //   movq rbp, rsp
   //   call L
   //   L: <code to adjust saved pc if there is any intrinsification code>
   //   ...
   //   pushq r15
   //   .....
   void EnterDartFrame(intptr_t frame_size);
   void EnterDartFrameWithInfo(intptr_t frame_size,
                               Register new_pp, Register new_pc);
+  void LeaveDartFrame();
 
   // Set up a Dart frame for a function compiled for on-stack replacement.
   // The frame layout is a normal Dart frame, but the frame is partially set
   // up on entry (it is the frame of the unoptimized code).
   void EnterOsrFrame(intptr_t extra_size, Register new_pp, Register new_pc);
 
   // Set up a stub frame so that the stack traversal code can easily identify
   // a stub frame.
   // The stub frame layout is as follows:
-  //   ....
+  //   ....       <=== RSP
+  //   pc (used to derive the RawInstruction Object of the stub)
+  //   saved RBP  <=== RBP
   //   ret PC
-  //   saved RBP
-  //   pc (used to derive the RawInstruction Object of the stub)
   //   .....
   // This code sets this up with the sequence:
   //   pushq rbp
   //   movq rbp, rsp
   //   pushq immediate(0)
   //   .....
-  void EnterStubFrame();
-  void EnterStubFrameWithPP();
+  void EnterStubFrame(bool load_pp = false);
+  void LeaveStubFrame();
 
   // Instruction pattern from entrypoint is used in dart frame prologues
   // to set up the frame and save a PC which can be used to figure out the
   // RawInstruction object corresponding to the code running in the frame.
   // entrypoint:
   //   pushq rbp          (size is 1 byte)
   //   movq rbp, rsp      (size is 3 bytes)
   //   call L             (size is 5 bytes)
   //   L:
   static const intptr_t kEntryPointToPcMarkerOffset = 9;
@@ skipping 222 matching lines @@
 }
 
 
 inline void Assembler::EmitOperandSizeOverride() {
   EmitUint8(0x66);
 }
 
 }  // namespace dart
 
 #endif  // VM_ASSEMBLER_X64_H_