Index: src/full-codegen/arm64/full-codegen-arm64.cc |
diff --git a/src/full-codegen/arm64/full-codegen-arm64.cc b/src/full-codegen/arm64/full-codegen-arm64.cc |
index 530d2bdeacf41e7900206baf7d13a32c59b50dff..ce61808d3c706221242fc555e88f41fa3b50005c 100644 |
--- a/src/full-codegen/arm64/full-codegen-arm64.cc |
+++ b/src/full-codegen/arm64/full-codegen-arm64.cc |
@@ -1158,11 +1158,8 @@ void FullCodeGenerator::EmitSetHomeObject(Expression* initializer, int offset, |
FeedbackVectorSlot slot) { |
DCHECK(NeedsHomeObject(initializer)); |
__ Peek(StoreDescriptor::ReceiverRegister(), 0); |
- __ Mov(StoreDescriptor::NameRegister(), |
- Operand(isolate()->factory()->home_object_symbol())); |
__ Peek(StoreDescriptor::ValueRegister(), offset * kPointerSize); |
- EmitLoadStoreICSlot(slot); |
- CallStoreIC(); |
+ CallStoreIC(slot, isolate()->factory()->home_object_symbol()); |
} |
@@ -1171,11 +1168,8 @@ void FullCodeGenerator::EmitSetHomeObjectAccumulator(Expression* initializer, |
FeedbackVectorSlot slot) { |
DCHECK(NeedsHomeObject(initializer)); |
__ Move(StoreDescriptor::ReceiverRegister(), x0); |
- __ Mov(StoreDescriptor::NameRegister(), |
- Operand(isolate()->factory()->home_object_symbol())); |
__ Peek(StoreDescriptor::ValueRegister(), offset * kPointerSize); |
- EmitLoadStoreICSlot(slot); |
- CallStoreIC(); |
+ CallStoreIC(slot, isolate()->factory()->home_object_symbol()); |
} |
@@ -1409,10 +1403,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
if (property->emit_store()) { |
VisitForAccumulatorValue(value); |
DCHECK(StoreDescriptor::ValueRegister().is(x0)); |
- __ Mov(StoreDescriptor::NameRegister(), Operand(key->value())); |
__ Peek(StoreDescriptor::ReceiverRegister(), 0); |
- EmitLoadStoreICSlot(property->GetSlot(0)); |
- CallStoreIC(); |
+ CallStoreIC(property->GetSlot(0), key->value()); |
PrepareForBailoutForId(key->id(), BailoutState::NO_REGISTERS); |
if (NeedsHomeObject(value)) { |
@@ -1606,8 +1598,7 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) { |
__ Mov(StoreDescriptor::NameRegister(), Smi::FromInt(array_index)); |
__ Peek(StoreDescriptor::ReceiverRegister(), 0); |
- EmitLoadStoreICSlot(expr->LiteralFeedbackSlot()); |
- CallKeyedStoreIC(); |
+ CallKeyedStoreIC(expr->LiteralFeedbackSlot()); |
PrepareForBailoutForId(expr->GetIdForElement(array_index), |
BailoutState::NO_REGISTERS); |
@@ -1949,10 +1940,7 @@ void FullCodeGenerator::EmitAssignment(Expression* expr, |
// this copy. |
__ Mov(StoreDescriptor::ReceiverRegister(), x0); |
PopOperand(StoreDescriptor::ValueRegister()); // Restore value. |
- __ Mov(StoreDescriptor::NameRegister(), |
- Operand(prop->key()->AsLiteral()->value())); |
- EmitLoadStoreICSlot(slot); |
- CallStoreIC(); |
+ CallStoreIC(slot, prop->key()->AsLiteral()->value()); |
break; |
} |
case NAMED_SUPER_PROPERTY: { |
@@ -1999,8 +1987,7 @@ void FullCodeGenerator::EmitAssignment(Expression* expr, |
__ Mov(StoreDescriptor::NameRegister(), x0); |
PopOperands(StoreDescriptor::ReceiverRegister(), |
StoreDescriptor::ValueRegister()); |
- EmitLoadStoreICSlot(slot); |
- CallKeyedStoreIC(); |
+ CallKeyedStoreIC(slot); |
break; |
} |
} |
@@ -2026,10 +2013,8 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, Token::Value op, |
ASM_LOCATION("FullCodeGenerator::EmitVariableAssignment"); |
if (var->IsUnallocated()) { |
// Global var, const, or let. |
- __ Mov(StoreDescriptor::NameRegister(), Operand(var->name())); |
__ LoadGlobalObject(StoreDescriptor::ReceiverRegister()); |
- EmitLoadStoreICSlot(slot); |
- CallStoreIC(); |
+ CallStoreIC(slot, var->name()); |
} else if (IsLexicalVariableMode(var->mode()) && op != Token::INIT) { |
DCHECK(!var->IsLookupSlot()); |
@@ -2095,11 +2080,8 @@ void FullCodeGenerator::EmitNamedPropertyAssignment(Assignment* expr) { |
DCHECK(prop != NULL); |
DCHECK(prop->key()->IsLiteral()); |
- __ Mov(StoreDescriptor::NameRegister(), |
- Operand(prop->key()->AsLiteral()->value())); |
PopOperand(StoreDescriptor::ReceiverRegister()); |
- EmitLoadStoreICSlot(expr->AssignmentSlot()); |
- CallStoreIC(); |
+ CallStoreIC(expr->AssignmentSlot(), prop->key()->AsLiteral()->value()); |
PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER); |
context()->Plug(x0); |
@@ -2144,8 +2126,7 @@ void FullCodeGenerator::EmitKeyedPropertyAssignment(Assignment* expr) { |
StoreDescriptor::ReceiverRegister()); |
DCHECK(StoreDescriptor::ValueRegister().is(x0)); |
- EmitLoadStoreICSlot(expr->AssignmentSlot()); |
- CallKeyedStoreIC(); |
+ CallKeyedStoreIC(expr->AssignmentSlot()); |
PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER); |
context()->Plug(x0); |
@@ -3226,11 +3207,8 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
} |
break; |
case NAMED_PROPERTY: { |
- __ Mov(StoreDescriptor::NameRegister(), |
- Operand(prop->key()->AsLiteral()->value())); |
PopOperand(StoreDescriptor::ReceiverRegister()); |
- EmitLoadStoreICSlot(expr->CountSlot()); |
- CallStoreIC(); |
+ CallStoreIC(expr->CountSlot(), prop->key()->AsLiteral()->value()); |
PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER); |
if (expr->is_postfix()) { |
if (!context()->IsEffect()) { |
@@ -3268,8 +3246,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
case KEYED_PROPERTY: { |
PopOperand(StoreDescriptor::NameRegister()); |
PopOperand(StoreDescriptor::ReceiverRegister()); |
- EmitLoadStoreICSlot(expr->CountSlot()); |
- CallKeyedStoreIC(); |
+ CallKeyedStoreIC(expr->CountSlot()); |
PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER); |
if (expr->is_postfix()) { |
if (!context()->IsEffect()) { |