Index: runtime/vm/intermediate_language_arm.cc |
diff --git a/runtime/vm/intermediate_language_arm.cc b/runtime/vm/intermediate_language_arm.cc |
index 1db4ad1b6c238ee93b4709cd9f2cc1af28d69990..254439720906956aab46822e693d2e151cc16f78 100644 |
--- a/runtime/vm/intermediate_language_arm.cc |
+++ b/runtime/vm/intermediate_language_arm.cc |
@@ -961,7 +961,8 @@ void NativeCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
} |
#endif |
} |
- __ LoadImmediate(R5, entry); |
+ ExternalLabel label(entry); |
+ __ LoadExternalLabel(R5, &label, kNotPatchable); |
__ LoadImmediate(R1, argc_tag); |
compiler->GenerateCall(token_pos(), |
*stub_entry, |
@@ -986,8 +987,9 @@ void StringFromCharCodeInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
ASSERT(compiler->is_optimizing()); |
const Register char_code = locs()->in(0).reg(); |
const Register result = locs()->out(0).reg(); |
- __ LoadImmediate(result, |
- reinterpret_cast<uword>(Symbols::PredefinedAddress())); |
+ |
+ ExternalLabel label(reinterpret_cast<uword>(Symbols::PredefinedAddress())); |
+ __ LoadExternalLabel(result, &label, kNotPatchable); |
__ AddImmediate(result, Symbols::kNullCharCodeSymbolOffset * kWordSize); |
__ ldr(result, Address(result, char_code, LSL, 1)); // Char code is a smi. |
} |