| Index: runtime/vm/intrinsifier_arm.cc
|
| diff --git a/runtime/vm/intrinsifier_arm.cc b/runtime/vm/intrinsifier_arm.cc
|
| index 4cd8e6a66abef9013df761e959c0e09beb7f1ab9..702ed7f859bd8fbd44e56a1a8179cdfab78d5fc2 100644
|
| --- a/runtime/vm/intrinsifier_arm.cc
|
| +++ b/runtime/vm/intrinsifier_arm.cc
|
| @@ -1661,8 +1661,14 @@ void Intrinsifier::StringBaseCharAt(Assembler* assembler) {
|
| __ ldrb(R1, Address(R0, R1));
|
| __ CompareImmediate(R1, Symbols::kNumberOfOneCharCodeSymbols);
|
| __ b(&fall_through, GE);
|
| - __ LoadImmediate(R0,
|
| - reinterpret_cast<uword>(Symbols::PredefinedAddress()));
|
| + const ExternalLabel symbols_label(
|
| + reinterpret_cast<uword>(Symbols::PredefinedAddress()));
|
| + __ Push(PP);
|
| + __ LoadPoolPointer();
|
| + assembler->set_constant_pool_allowed(true);
|
| + __ LoadExternalLabel(R0, &symbols_label, kNotPatchable);
|
| + assembler->set_constant_pool_allowed(false);
|
| + __ Pop(PP);
|
| __ AddImmediate(R0, Symbols::kNullCharCodeSymbolOffset * kWordSize);
|
| __ ldr(R0, Address(R0, R1, LSL, 2));
|
| __ Ret();
|
| @@ -1675,8 +1681,12 @@ void Intrinsifier::StringBaseCharAt(Assembler* assembler) {
|
| __ ldrh(R1, Address(R0, R1));
|
| __ CompareImmediate(R1, Symbols::kNumberOfOneCharCodeSymbols);
|
| __ b(&fall_through, GE);
|
| - __ LoadImmediate(R0,
|
| - reinterpret_cast<uword>(Symbols::PredefinedAddress()));
|
| + __ Push(PP);
|
| + __ LoadPoolPointer();
|
| + assembler->set_constant_pool_allowed(true);
|
| + __ LoadExternalLabel(R0, &symbols_label, kNotPatchable);
|
| + assembler->set_constant_pool_allowed(false);
|
| + __ Pop(PP);
|
| __ AddImmediate(R0, Symbols::kNullCharCodeSymbolOffset * kWordSize);
|
| __ ldr(R0, Address(R0, R1, LSL, 2));
|
| __ Ret();
|
|
|