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 717d65635b38d4b25a5fef07bb9040e3ab006654..6cd879176faab4d4e4c858f66dc14272272dfc6b 100644 |
--- a/src/full-codegen/arm64/full-codegen-arm64.cc |
+++ b/src/full-codegen/arm64/full-codegen-arm64.cc |
@@ -1235,7 +1235,7 @@ void FullCodeGenerator::EmitSetHomeObject(Expression* initializer, int offset, |
__ Mov(StoreDescriptor::NameRegister(), |
Operand(isolate()->factory()->home_object_symbol())); |
__ Peek(StoreDescriptor::ValueRegister(), offset * kPointerSize); |
- if (FLAG_vector_stores) EmitLoadStoreICSlot(slot); |
+ EmitLoadStoreICSlot(slot); |
CallStoreIC(); |
} |
@@ -1248,7 +1248,7 @@ void FullCodeGenerator::EmitSetHomeObjectAccumulator(Expression* initializer, |
__ Mov(StoreDescriptor::NameRegister(), |
Operand(isolate()->factory()->home_object_symbol())); |
__ Peek(StoreDescriptor::ValueRegister(), offset * kPointerSize); |
- if (FLAG_vector_stores) EmitLoadStoreICSlot(slot); |
+ EmitLoadStoreICSlot(slot); |
CallStoreIC(); |
} |
@@ -1563,12 +1563,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
DCHECK(StoreDescriptor::ValueRegister().is(x0)); |
__ Mov(StoreDescriptor::NameRegister(), Operand(key->value())); |
__ Peek(StoreDescriptor::ReceiverRegister(), 0); |
- if (FLAG_vector_stores) { |
- EmitLoadStoreICSlot(property->GetSlot(0)); |
- CallStoreIC(); |
- } else { |
- CallStoreIC(key->LiteralFeedbackId()); |
- } |
+ EmitLoadStoreICSlot(property->GetSlot(0)); |
+ CallStoreIC(); |
PrepareForBailoutForId(key->id(), NO_REGISTERS); |
if (NeedsHomeObject(value)) { |
@@ -1760,27 +1756,12 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) { |
} |
VisitForAccumulatorValue(subexpr); |
- if (FLAG_vector_stores) { |
- __ Mov(StoreDescriptor::NameRegister(), Smi::FromInt(array_index)); |
- __ Peek(StoreDescriptor::ReceiverRegister(), kPointerSize); |
- EmitLoadStoreICSlot(expr->LiteralFeedbackSlot()); |
- Handle<Code> ic = |
- CodeFactory::KeyedStoreIC(isolate(), language_mode()).code(); |
- CallIC(ic); |
- } else if (has_fast_elements) { |
- int offset = FixedArray::kHeaderSize + (array_index * kPointerSize); |
- __ Peek(x6, kPointerSize); // Copy of array literal. |
- __ Ldr(x1, FieldMemOperand(x6, JSObject::kElementsOffset)); |
- __ Str(result_register(), FieldMemOperand(x1, offset)); |
- // Update the write barrier for the array store. |
- __ RecordWriteField(x1, offset, result_register(), x10, |
- kLRHasBeenSaved, kDontSaveFPRegs, |
- EMIT_REMEMBERED_SET, INLINE_SMI_CHECK); |
- } else { |
- __ Mov(x3, Smi::FromInt(array_index)); |
- StoreArrayLiteralElementStub stub(isolate()); |
- __ CallStub(&stub); |
- } |
+ __ Mov(StoreDescriptor::NameRegister(), Smi::FromInt(array_index)); |
+ __ Peek(StoreDescriptor::ReceiverRegister(), kPointerSize); |
+ EmitLoadStoreICSlot(expr->LiteralFeedbackSlot()); |
+ Handle<Code> ic = |
+ CodeFactory::KeyedStoreIC(isolate(), language_mode()).code(); |
+ CallIC(ic); |
PrepareForBailoutForId(expr->GetIdForElement(array_index), NO_REGISTERS); |
} |
@@ -2209,7 +2190,7 @@ void FullCodeGenerator::EmitAssignment(Expression* expr, |
__ Pop(StoreDescriptor::ValueRegister()); // Restore value. |
__ Mov(StoreDescriptor::NameRegister(), |
Operand(prop->key()->AsLiteral()->value())); |
- if (FLAG_vector_stores) EmitLoadStoreICSlot(slot); |
+ EmitLoadStoreICSlot(slot); |
CallStoreIC(); |
break; |
} |
@@ -2257,7 +2238,7 @@ void FullCodeGenerator::EmitAssignment(Expression* expr, |
__ Mov(StoreDescriptor::NameRegister(), x0); |
__ Pop(StoreDescriptor::ReceiverRegister(), |
StoreDescriptor::ValueRegister()); |
- if (FLAG_vector_stores) EmitLoadStoreICSlot(slot); |
+ EmitLoadStoreICSlot(slot); |
Handle<Code> ic = |
CodeFactory::KeyedStoreIC(isolate(), language_mode()).code(); |
CallIC(ic); |
@@ -2288,7 +2269,7 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, Token::Value op, |
// Global var, const, or let. |
__ Mov(StoreDescriptor::NameRegister(), Operand(var->name())); |
__ Ldr(StoreDescriptor::ReceiverRegister(), GlobalObjectMemOperand()); |
- if (FLAG_vector_stores) EmitLoadStoreICSlot(slot); |
+ EmitLoadStoreICSlot(slot); |
CallStoreIC(); |
} else if (var->mode() == LET && op != Token::INIT) { |
@@ -2395,12 +2376,8 @@ void FullCodeGenerator::EmitNamedPropertyAssignment(Assignment* expr) { |
__ Mov(StoreDescriptor::NameRegister(), |
Operand(prop->key()->AsLiteral()->value())); |
__ Pop(StoreDescriptor::ReceiverRegister()); |
- if (FLAG_vector_stores) { |
- EmitLoadStoreICSlot(expr->AssignmentSlot()); |
- CallStoreIC(); |
- } else { |
- CallStoreIC(expr->AssignmentFeedbackId()); |
- } |
+ EmitLoadStoreICSlot(expr->AssignmentSlot()); |
+ CallStoreIC(); |
PrepareForBailoutForId(expr->AssignmentId(), TOS_REG); |
context()->Plug(x0); |
@@ -2447,12 +2424,8 @@ void FullCodeGenerator::EmitKeyedPropertyAssignment(Assignment* expr) { |
Handle<Code> ic = |
CodeFactory::KeyedStoreIC(isolate(), language_mode()).code(); |
- if (FLAG_vector_stores) { |
- EmitLoadStoreICSlot(expr->AssignmentSlot()); |
- CallIC(ic); |
- } else { |
- CallIC(ic, expr->AssignmentFeedbackId()); |
- } |
+ EmitLoadStoreICSlot(expr->AssignmentSlot()); |
+ CallIC(ic); |
PrepareForBailoutForId(expr->AssignmentId(), TOS_REG); |
context()->Plug(x0); |
@@ -4299,12 +4272,8 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
__ Mov(StoreDescriptor::NameRegister(), |
Operand(prop->key()->AsLiteral()->value())); |
__ Pop(StoreDescriptor::ReceiverRegister()); |
- if (FLAG_vector_stores) { |
- EmitLoadStoreICSlot(expr->CountSlot()); |
- CallStoreIC(); |
- } else { |
- CallStoreIC(expr->CountStoreFeedbackId()); |
- } |
+ EmitLoadStoreICSlot(expr->CountSlot()); |
+ CallStoreIC(); |
PrepareForBailoutForId(expr->AssignmentId(), TOS_REG); |
if (expr->is_postfix()) { |
if (!context()->IsEffect()) { |
@@ -4342,12 +4311,8 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
__ Pop(StoreDescriptor::ReceiverRegister()); |
Handle<Code> ic = |
CodeFactory::KeyedStoreIC(isolate(), language_mode()).code(); |
- if (FLAG_vector_stores) { |
- EmitLoadStoreICSlot(expr->CountSlot()); |
- CallIC(ic); |
- } else { |
- CallIC(ic, expr->CountStoreFeedbackId()); |
- } |
+ EmitLoadStoreICSlot(expr->CountSlot()); |
+ CallIC(ic); |
PrepareForBailoutForId(expr->AssignmentId(), TOS_REG); |
if (expr->is_postfix()) { |
if (!context()->IsEffect()) { |
@@ -4977,7 +4942,7 @@ void FullCodeGenerator::ClearPendingMessage() { |
void FullCodeGenerator::EmitLoadStoreICSlot(FeedbackVectorSlot slot) { |
- DCHECK(FLAG_vector_stores && !slot.IsInvalid()); |
+ DCHECK(!slot.IsInvalid()); |
__ Mov(VectorStoreICTrampolineDescriptor::SlotRegister(), SmiFromSlot(slot)); |
} |