| Index: runtime/vm/intrinsifier_x64.cc
|
| diff --git a/runtime/vm/intrinsifier_x64.cc b/runtime/vm/intrinsifier_x64.cc
|
| index ee104c683a39a692034788732cfa79f0ad157372..a034e69d36a4a0faabb46c476d9124478a9e2be0 100644
|
| --- a/runtime/vm/intrinsifier_x64.cc
|
| +++ b/runtime/vm/intrinsifier_x64.cc
|
| @@ -1609,8 +1609,14 @@ void Intrinsifier::StringBaseCharAt(Assembler* assembler) {
|
| __ movzxb(RCX, FieldAddress(RAX, RCX, TIMES_1, OneByteString::data_offset()));
|
| __ cmpq(RCX, Immediate(Symbols::kNumberOfOneCharCodeSymbols));
|
| __ j(GREATER_EQUAL, &fall_through);
|
| - __ movq(RAX,
|
| - Immediate(reinterpret_cast<uword>(Symbols::PredefinedAddress())));
|
| + const ExternalLabel symbols_label(
|
| + reinterpret_cast<uword>(Symbols::PredefinedAddress()));
|
| + __ pushq(PP);
|
| + __ LoadPoolPointer(PP);
|
| + assembler->set_constant_pool_allowed(true);
|
| + __ LoadExternalLabel(RAX, &symbols_label, kNotPatchable, PP);
|
| + assembler->set_constant_pool_allowed(false);
|
| + __ popq(PP);
|
| __ movq(RAX, Address(RAX,
|
| RCX,
|
| TIMES_8,
|
| @@ -1624,8 +1630,12 @@ void Intrinsifier::StringBaseCharAt(Assembler* assembler) {
|
| __ movzxw(RCX, FieldAddress(RAX, RCX, TIMES_1, OneByteString::data_offset()));
|
| __ cmpq(RCX, Immediate(Symbols::kNumberOfOneCharCodeSymbols));
|
| __ j(GREATER_EQUAL, &fall_through);
|
| - __ movq(RAX,
|
| - Immediate(reinterpret_cast<uword>(Symbols::PredefinedAddress())));
|
| + __ pushq(PP);
|
| + __ LoadPoolPointer(PP);
|
| + assembler->set_constant_pool_allowed(true);
|
| + __ LoadExternalLabel(RAX, &symbols_label, kNotPatchable, PP);
|
| + assembler->set_constant_pool_allowed(false);
|
| + __ popq(PP);
|
| __ movq(RAX, Address(RAX,
|
| RCX,
|
| TIMES_8,
|
|
|