VM: More abstract interface for generating stub calls.

runtime/vm/instructions_arm_test.cc

Index: runtime/vm/instructions_arm_test.cc
diff --git a/runtime/vm/instructions_arm_test.cc b/runtime/vm/instructions_arm_test.cc
index 0db757a13d54156255c7aa19bc26f18c3c1e0439..540fd5f8163cf68a33b975e85b52de6d78bd9408 100644
--- a/runtime/vm/instructions_arm_test.cc
+++ b/runtime/vm/instructions_arm_test.cc
@@ -18,7 +18,7 @@ namespace dart {
 ASSEMBLER_TEST_GENERATE(Call, assembler) {
   // Code accessing pp is generated, but not executed. Uninitialized pp is OK.
   __ set_constant_pool_allowed(true);
-  __ BranchLinkPatchable(&StubCode::InvokeDartCodeLabel());
+  __ BranchLinkPatchable(*StubCode::InvokeDartCode_entry());
   __ Ret();
 }
 
@@ -29,15 +29,14 @@ ASSEMBLER_TEST_RUN(Call, test) {
   // before the end of the code buffer.
   CallPattern call(test->entry() + test->code().Size() - Instr::kInstrSize,
                    test->code());
-  EXPECT_EQ(StubCode::InvokeDartCodeLabel().address(),
+  EXPECT_EQ(StubCode::InvokeDartCode_entry()->label().address(),
             call.TargetAddress());
 }
 
 
 ASSEMBLER_TEST_GENERATE(Jump, assembler) {
-  __ BranchPatchable(&StubCode::InvokeDartCodeLabel());
-  const ExternalLabel array_label(StubCode::AllocateArrayEntryPoint());
-  __ BranchPatchable(&array_label);
+  __ BranchPatchable(*StubCode::InvokeDartCode_entry());
+  __ BranchPatchable(*StubCode::AllocateArray_entry());
 }
 
 
@@ -50,7 +49,7 @@ ASSEMBLER_TEST_RUN(Jump, test) {
                              VirtualMemory::kReadWrite);
   EXPECT(status);
   JumpPattern jump1(test->entry(), test->code());
-  EXPECT_EQ(StubCode::InvokeDartCodeLabel().address(),
+  EXPECT_EQ(StubCode::InvokeDartCode_entry()->label().address(),
             jump1.TargetAddress());
   JumpPattern jump2(test->entry() + jump1.pattern_length_in_bytes(),
                     test->code());
@@ -62,7 +61,7 @@ ASSEMBLER_TEST_RUN(Jump, test) {
   jump1.SetTargetAddress(target2);
   jump2.SetTargetAddress(target1);
   EXPECT_EQ(array_stub.EntryPoint(), jump1.TargetAddress());
-  EXPECT_EQ(StubCode::InvokeDartCodeLabel().address(),
+  EXPECT_EQ(StubCode::InvokeDartCode_entry()->label().address(),
             jump2.TargetAddress());
 }
 
@@ -71,9 +70,8 @@ ASSEMBLER_TEST_RUN(Jump, test) {
 ASSEMBLER_TEST_GENERATE(JumpARMv6, assembler) {
   // ARMv7 is the default.
   HostCPUFeatures::set_arm_version(ARMv6);
-  __ BranchPatchable(&StubCode::InvokeDartCodeLabel());
-  const ExternalLabel array_label(StubCode::AllocateArrayEntryPoint());
-  __ BranchPatchable(&array_label);
+  __ BranchPatchable(*StubCode::InvokeDartCode_entry());
+  __ BranchPatchable(*StubCode::AllocateArray_entry());
   HostCPUFeatures::set_arm_version(ARMv7);
 }
 
@@ -88,7 +86,7 @@ ASSEMBLER_TEST_RUN(JumpARMv6, test) {
                              VirtualMemory::kReadWrite);
   EXPECT(status);
   JumpPattern jump1(test->entry(), test->code());
-  EXPECT_EQ(StubCode::InvokeDartCodeLabel().address(),
+  EXPECT_EQ(StubCode::InvokeDartCode_entry()->label().address(),
             jump1.TargetAddress());
   JumpPattern jump2(test->entry() + jump1.pattern_length_in_bytes(),
                     test->code());
@@ -100,7 +98,7 @@ ASSEMBLER_TEST_RUN(JumpARMv6, test) {
   jump1.SetTargetAddress(target2);
   jump2.SetTargetAddress(target1);
   EXPECT_EQ(array_stub.EntryPoint(), jump1.TargetAddress());
-  EXPECT_EQ(StubCode::InvokeDartCodeLabel().address(),
+  EXPECT_EQ(StubCode::InvokeDartCode_entry()->label().address(),
             jump2.TargetAddress());
   HostCPUFeatures::set_arm_version(ARMv7);
 }