Fix for issue 14790 - Crash when using dartium devtools

runtime/vm/instructions_x64_test.cc

 // Copyright (c) 2012, 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/instructions.h"
 #include "vm/stub_code.h"
 #include "vm/unit_test.h"
 
 namespace dart {
 
 #define __ assembler->
 
 ASSEMBLER_TEST_GENERATE(Call, assembler) {
   __ call(&StubCode::InstanceFunctionLookupLabel());
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Call, test) {
   CallPattern call(test->entry(), test->code());
   EXPECT_EQ(StubCode::InstanceFunctionLookupLabel().address(),
             call.TargetAddress());
 }
 
 
+static intptr_t prologue_code_size = -1;
+
+
 ASSEMBLER_TEST_GENERATE(Jump, assembler) {
-  __ EnterDartFrame(0);  // 20 bytes
+  ASSERT(assembler->CodeSize() == 0);
+  __ pushq(PP);
+  __ LoadPoolPointer(PP);
+  prologue_code_size = assembler->CodeSize();
   __ JmpPatchable(&StubCode::InstanceFunctionLookupLabel(), PP);
   __ JmpPatchable(&StubCode::AllocateArrayLabel(), PP);
-  __ LeaveFrameWithPP();
+  __ popq(PP);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Jump, test) {
-  JumpPattern jump1(test->entry() + 20, test->code());
+  ASSERT(prologue_code_size != -1);
+  JumpPattern jump1(test->entry() + prologue_code_size, test->code());
   jump1.IsValid();
   EXPECT_EQ(StubCode::InstanceFunctionLookupLabel().address(),
             jump1.TargetAddress());
-  JumpPattern jump2(test->entry() + jump1.pattern_length_in_bytes() + 20,
+  JumpPattern jump2((test->entry() +
+                     jump1.pattern_length_in_bytes() + prologue_code_size),
                     test->code());
   EXPECT_EQ(StubCode::AllocateArrayLabel().address(),
             jump2.TargetAddress());
   uword target1 = jump1.TargetAddress();
   uword target2 = jump2.TargetAddress();
   jump1.SetTargetAddress(target2);
   jump2.SetTargetAddress(target1);
   EXPECT_EQ(StubCode::AllocateArrayLabel().address(),
             jump1.TargetAddress());
   EXPECT_EQ(StubCode::InstanceFunctionLookupLabel().address(),
             jump2.TargetAddress());
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64