| Index: src/arm64/lithium-codegen-arm64.cc
|
| diff --git a/src/arm64/lithium-codegen-arm64.cc b/src/arm64/lithium-codegen-arm64.cc
|
| index f1b23d671c60465fca1581cba36cd5019ca6ed68..662bdd8ab4819b44b22faf16002e48a50d2e4b7b 100644
|
| --- a/src/arm64/lithium-codegen-arm64.cc
|
| +++ b/src/arm64/lithium-codegen-arm64.cc
|
| @@ -3399,9 +3399,9 @@ void LCodeGen::DoLoadGlobalCell(LLoadGlobalCell* instr) {
|
|
|
| void LCodeGen::DoLoadGlobalGeneric(LLoadGlobalGeneric* instr) {
|
| ASSERT(ToRegister(instr->context()).is(cp));
|
| - ASSERT(ToRegister(instr->global_object()).Is(x0));
|
| + ASSERT(ToRegister(instr->global_object()).is(LoadIC::ReceiverRegister()));
|
| ASSERT(ToRegister(instr->result()).Is(x0));
|
| - __ Mov(x2, Operand(instr->name()));
|
| + __ Mov(LoadIC::NameRegister(), Operand(instr->name()));
|
| ContextualMode mode = instr->for_typeof() ? NOT_CONTEXTUAL : CONTEXTUAL;
|
| Handle<Code> ic = LoadIC::initialize_stub(isolate(), mode);
|
| CallCode(ic, RelocInfo::CODE_TARGET, instr);
|
| @@ -3653,8 +3653,8 @@ void LCodeGen::DoLoadKeyedFixed(LLoadKeyedFixed* instr) {
|
|
|
| void LCodeGen::DoLoadKeyedGeneric(LLoadKeyedGeneric* instr) {
|
| ASSERT(ToRegister(instr->context()).is(cp));
|
| - ASSERT(ToRegister(instr->object()).Is(x1));
|
| - ASSERT(ToRegister(instr->key()).Is(x0));
|
| + ASSERT(ToRegister(instr->object()).is(KeyedLoadIC::ReceiverRegister()));
|
| + ASSERT(ToRegister(instr->key()).is(KeyedLoadIC::NameRegister()));
|
|
|
| Handle<Code> ic = isolate()->builtins()->KeyedLoadIC_Initialize();
|
| CallCode(ic, RelocInfo::CODE_TARGET, instr);
|
| @@ -3704,9 +3704,10 @@ void LCodeGen::DoLoadNamedField(LLoadNamedField* instr) {
|
|
|
| void LCodeGen::DoLoadNamedGeneric(LLoadNamedGeneric* instr) {
|
| ASSERT(ToRegister(instr->context()).is(cp));
|
| - // LoadIC expects x2 to hold the name, and x0 to hold the receiver.
|
| + // LoadIC expects name and receiver in registers.
|
| + ASSERT(ToRegister(instr->object()).is(LoadIC::ReceiverRegister()));
|
| ASSERT(ToRegister(instr->object()).is(x0));
|
| - __ Mov(x2, Operand(instr->name()));
|
| + __ Mov(LoadIC::NameRegister(), Operand(instr->name()));
|
|
|
| Handle<Code> ic = LoadIC::initialize_stub(isolate(), NOT_CONTEXTUAL);
|
| CallCode(ic, RelocInfo::CODE_TARGET, instr);
|
|
|