- Remove Isolate::CurrentAddress().

runtime/vm/stub_code_arm64.cc

Index: runtime/vm/stub_code_arm64.cc
===================================================================
--- runtime/vm/stub_code_arm64.cc	(revision 40623)
+++ runtime/vm/stub_code_arm64.cc	(working copy)
@@ -838,7 +838,7 @@
   __ LoadFromOffset(CTX, R3, VMHandles::kOffsetOfRawPtrInHandle, PP);
 
   // Load Isolate pointer into temporary register R5.
-  __ LoadImmediate(R5, Isolate::CurrentAddress(), PP);
+  __ LoadIsolate(R5, PP);
 
   // Cache the new Context pointer into CTX while executing Dart code.
   __ LoadFromOffset(CTX, R3, VMHandles::kOffsetOfRawPtrInHandle, PP);
@@ -912,7 +912,7 @@
   __ AddImmediate(SP, FP, kSavedContextSlotFromEntryFp * kWordSize, PP);
 
   // Load Isolate pointer into CTX. Drop Context.
-  __ LoadImmediate(CTX, Isolate::CurrentAddress(), PP);
+  __ LoadIsolate(CTX, PP);
 
   // Restore the current VMTag from the stack.
   __ ldr(R4, Address(SP, 2 * kWordSize));
@@ -1029,7 +1029,7 @@
     // Load Isolate pointer into R2.
     // R0: new object.
     // R1: number of context variables.
-    __ LoadImmediate(R2, Isolate::CurrentAddress(), kNoPP);
+    __ LoadIsolate(R2, kNoPP);
     // R2: isolate, not an object.
     __ StoreFieldToOffset(R2, R0, Context::isolate_offset(), kNoPP);
 
@@ -1102,7 +1102,7 @@
   // Load the isolate.
   // Spilled: R1, R2, R3.
   // R0: address being stored.
-  __ LoadImmediate(R1, Isolate::CurrentAddress(), kNoPP);
+  __ LoadIsolate(R1, kNoPP);
 
   // Load the StoreBuffer block out of the isolate. Then load top_ out of the
   // StoreBufferBlock and add the address to the pointers_.
@@ -1133,7 +1133,7 @@
   // Setup frame, push callee-saved registers.
 
   __ EnterCallRuntimeFrame(0 * kWordSize);
-  __ LoadImmediate(R0, Isolate::CurrentAddress(), kNoPP);
+  __ LoadIsolate(R0, kNoPP);
   __ CallRuntime(kStoreBufferBlockProcessRuntimeEntry, 1);
   // Restore callee-saved registers, tear down frame.
   __ LeaveCallRuntimeFrame();
@@ -1449,7 +1449,7 @@
 
   // Check single stepping.
   Label stepping, done_stepping;
-  __ LoadImmediate(R6, Isolate::CurrentAddress(), kNoPP);
+  __ LoadIsolate(R6, kNoPP);
   __ LoadFromOffset(
       R6, R6, Isolate::single_step_offset(), kNoPP, kUnsignedByte);
   __ CompareRegisters(R6, ZR);
@@ -1681,7 +1681,7 @@
 
   // Check single stepping.
   Label stepping, done_stepping;
-  __ LoadImmediate(R6, Isolate::CurrentAddress(), kNoPP);
+  __ LoadIsolate(R6, kNoPP);
   __ LoadFromOffset(
       R6, R6, Isolate::single_step_offset(), kNoPP, kUnsignedByte);
   __ CompareImmediate(R6, 0, kNoPP);