VM: New calling convention for generated code.

runtime/vm/instructions_x64_test.cc

Index: runtime/vm/instructions_x64_test.cc
diff --git a/runtime/vm/instructions_x64_test.cc b/runtime/vm/instructions_x64_test.cc
index b9e3eb237e3c258a2401b61c35442d5a266d3734..ef07c3687dc277a893cd48fd8a430c54d8b381bf 100644
--- a/runtime/vm/instructions_x64_test.cc
+++ b/runtime/vm/instructions_x64_test.cc
@@ -30,10 +30,8 @@ ASSEMBLER_TEST_GENERATE(Jump, assembler) {
   __ LoadPoolPointer(PP);
   prologue_code_size = assembler->CodeSize();
   StubCode* stub_code = Isolate::Current()->stub_code();
-  __ JmpPatchable(&stub_code->InvokeDartCodeLabel(), PP);
-  const Code& array_stub = Code::Handle(stub_code->GetAllocateArrayStub());
-  const ExternalLabel array_label(array_stub.EntryPoint());
-  __ JmpPatchable(&array_label, PP);
+  __ JmpPatchable(Code::Handle(stub_code->InvokeDartCodeCode()), PP);
+  __ JmpPatchable(Code::Handle(stub_code->GetAllocateArrayStub()), PP);
   __ popq(PP);
   __ ret();
 }
@@ -51,20 +49,18 @@ ASSEMBLER_TEST_RUN(Jump, test) {
   EXPECT(status);
   JumpPattern jump1(test->entry() + prologue_code_size, test->code());
   jump1.IsValid();
-  EXPECT_EQ(stub_code->InvokeDartCodeLabel().address(),
-            jump1.TargetAddress());
+  EXPECT_EQ(stub_code->InvokeDartCodeCode(), jump1.TargetCode());
   JumpPattern jump2((test->entry() +
                      jump1.pattern_length_in_bytes() + prologue_code_size),
                     test->code());
   const Code& array_stub = Code::Handle(stub_code->GetAllocateArrayStub());
-  EXPECT_EQ(array_stub.EntryPoint(), jump2.TargetAddress());
-  uword target1 = jump1.TargetAddress();
-  uword target2 = jump2.TargetAddress();
-  jump1.SetTargetAddress(target2);
-  jump2.SetTargetAddress(target1);
-  EXPECT_EQ(array_stub.EntryPoint(), jump1.TargetAddress());
-  EXPECT_EQ(stub_code->InvokeDartCodeLabel().address(),
-            jump2.TargetAddress());
+  EXPECT_EQ(array_stub.raw(), jump2.TargetCode());
+  const Code& target1 = Code::Handle(jump1.TargetCode());
+  const Code& target2 = Code::Handle(jump2.TargetCode());
+  jump1.SetTargetCode(target2);
+  jump2.SetTargetCode(target1);
+  EXPECT_EQ(array_stub.raw(), jump1.TargetCode());
+  EXPECT_EQ(stub_code->InvokeDartCodeCode(), jump2.TargetCode());
 }
 
 }  // namespace dart