| Index: runtime/vm/intrinsifier_x64.cc
|
| diff --git a/runtime/vm/intrinsifier_x64.cc b/runtime/vm/intrinsifier_x64.cc
|
| index b911a990b0fbc8fb9ea9fef0a9a8d80c15ee239a..b8d56de5ca477d182d51580ce772c05fc0ddc9f8 100644
|
| --- a/runtime/vm/intrinsifier_x64.cc
|
| +++ b/runtime/vm/intrinsifier_x64.cc
|
| @@ -1608,14 +1608,7 @@ 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);
|
| - const ExternalLabel symbols_label(
|
| - reinterpret_cast<uword>(Symbols::PredefinedAddress()));
|
| - __ pushq(PP);
|
| - __ LoadPoolPointer();
|
| - assembler->set_constant_pool_allowed(true);
|
| - __ LoadExternalLabel(RAX, &symbols_label, kNotPatchable);
|
| - assembler->set_constant_pool_allowed(false);
|
| - __ popq(PP);
|
| + __ movq(RAX, Address(THR, Thread::predefined_symbols_address_offset()));
|
| __ movq(RAX, Address(RAX,
|
| RCX,
|
| TIMES_8,
|
| @@ -1629,12 +1622,7 @@ 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);
|
| - __ pushq(PP);
|
| - __ LoadPoolPointer();
|
| - assembler->set_constant_pool_allowed(true);
|
| - __ LoadExternalLabel(RAX, &symbols_label, kNotPatchable);
|
| - assembler->set_constant_pool_allowed(false);
|
| - __ popq(PP);
|
| + __ movq(RAX, Address(THR, Thread::predefined_symbols_address_offset()));
|
| __ movq(RAX, Address(RAX,
|
| RCX,
|
| TIMES_8,
|
|
|