| Index: src/full-codegen/mips/full-codegen-mips.cc
|
| diff --git a/src/full-codegen/mips/full-codegen-mips.cc b/src/full-codegen/mips/full-codegen-mips.cc
|
| index 661ff80fa61105141d3817a822fa2f5f6e72aba9..cfe1e8f6fb2b8d4ddd40385396789f703235e05a 100644
|
| --- a/src/full-codegen/mips/full-codegen-mips.cc
|
| +++ b/src/full-codegen/mips/full-codegen-mips.cc
|
| @@ -1238,7 +1238,7 @@ void FullCodeGenerator::EmitSetHomeObject(Expression* initializer, int offset,
|
| Operand(isolate()->factory()->home_object_symbol()));
|
| __ lw(StoreDescriptor::ValueRegister(),
|
| MemOperand(sp, offset * kPointerSize));
|
| - if (FLAG_vector_stores) EmitLoadStoreICSlot(slot);
|
| + EmitLoadStoreICSlot(slot);
|
| CallStoreIC();
|
| }
|
|
|
| @@ -1252,7 +1252,7 @@ void FullCodeGenerator::EmitSetHomeObjectAccumulator(Expression* initializer,
|
| Operand(isolate()->factory()->home_object_symbol()));
|
| __ lw(StoreDescriptor::ValueRegister(),
|
| MemOperand(sp, offset * kPointerSize));
|
| - if (FLAG_vector_stores) EmitLoadStoreICSlot(slot);
|
| + EmitLoadStoreICSlot(slot);
|
| CallStoreIC();
|
| }
|
|
|
| @@ -1574,12 +1574,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {
|
| DCHECK(StoreDescriptor::ValueRegister().is(a0));
|
| __ li(StoreDescriptor::NameRegister(), Operand(key->value()));
|
| __ lw(StoreDescriptor::ReceiverRegister(), MemOperand(sp));
|
| - 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)) {
|
| @@ -1774,30 +1770,13 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) {
|
|
|
| VisitForAccumulatorValue(subexpr);
|
|
|
| - if (FLAG_vector_stores) {
|
| - __ li(StoreDescriptor::NameRegister(),
|
| - Operand(Smi::FromInt(array_index)));
|
| - __ lw(StoreDescriptor::ReceiverRegister(), MemOperand(sp, kPointerSize));
|
| - __ mov(StoreDescriptor::ValueRegister(), result_register());
|
| - 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);
|
| - __ lw(t2, MemOperand(sp, kPointerSize)); // Copy of array literal.
|
| - __ lw(a1, FieldMemOperand(t2, JSObject::kElementsOffset));
|
| - __ sw(result_register(), FieldMemOperand(a1, offset));
|
| - // Update the write barrier for the array store.
|
| - __ RecordWriteField(a1, offset, result_register(), a2,
|
| - kRAHasBeenSaved, kDontSaveFPRegs,
|
| - EMIT_REMEMBERED_SET, INLINE_SMI_CHECK);
|
| - } else {
|
| - __ li(a3, Operand(Smi::FromInt(array_index)));
|
| - __ mov(a0, result_register());
|
| - StoreArrayLiteralElementStub stub(isolate());
|
| - __ CallStub(&stub);
|
| - }
|
| + __ li(StoreDescriptor::NameRegister(), Operand(Smi::FromInt(array_index)));
|
| + __ lw(StoreDescriptor::ReceiverRegister(), MemOperand(sp, kPointerSize));
|
| + __ mov(StoreDescriptor::ValueRegister(), result_register());
|
| + EmitLoadStoreICSlot(expr->LiteralFeedbackSlot());
|
| + Handle<Code> ic =
|
| + CodeFactory::KeyedStoreIC(isolate(), language_mode()).code();
|
| + CallIC(ic);
|
|
|
| PrepareForBailoutForId(expr->GetIdForElement(array_index), NO_REGISTERS);
|
| }
|
| @@ -2502,7 +2481,7 @@ void FullCodeGenerator::EmitAssignment(Expression* expr,
|
| __ pop(StoreDescriptor::ValueRegister()); // Restore value.
|
| __ li(StoreDescriptor::NameRegister(),
|
| Operand(prop->key()->AsLiteral()->value()));
|
| - if (FLAG_vector_stores) EmitLoadStoreICSlot(slot);
|
| + EmitLoadStoreICSlot(slot);
|
| CallStoreIC();
|
| break;
|
| }
|
| @@ -2550,7 +2529,7 @@ void FullCodeGenerator::EmitAssignment(Expression* expr,
|
| __ mov(StoreDescriptor::NameRegister(), result_register());
|
| __ Pop(StoreDescriptor::ValueRegister(),
|
| StoreDescriptor::ReceiverRegister());
|
| - if (FLAG_vector_stores) EmitLoadStoreICSlot(slot);
|
| + EmitLoadStoreICSlot(slot);
|
| Handle<Code> ic =
|
| CodeFactory::KeyedStoreIC(isolate(), language_mode()).code();
|
| CallIC(ic);
|
| @@ -2581,7 +2560,7 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, Token::Value op,
|
| __ mov(StoreDescriptor::ValueRegister(), result_register());
|
| __ li(StoreDescriptor::NameRegister(), Operand(var->name()));
|
| __ lw(StoreDescriptor::ReceiverRegister(), GlobalObjectOperand());
|
| - if (FLAG_vector_stores) EmitLoadStoreICSlot(slot);
|
| + EmitLoadStoreICSlot(slot);
|
| CallStoreIC();
|
|
|
| } else if (var->mode() == LET && op != Token::INIT) {
|
| @@ -2689,12 +2668,8 @@ void FullCodeGenerator::EmitNamedPropertyAssignment(Assignment* expr) {
|
| __ li(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(v0);
|
| @@ -2744,12 +2719,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(v0);
|
| @@ -4620,12 +4591,8 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) {
|
| __ li(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()) {
|
| @@ -4664,12 +4631,8 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) {
|
| StoreDescriptor::NameRegister());
|
| 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()) {
|
| @@ -4973,7 +4936,7 @@ void FullCodeGenerator::ClearPendingMessage() {
|
|
|
|
|
| void FullCodeGenerator::EmitLoadStoreICSlot(FeedbackVectorSlot slot) {
|
| - DCHECK(FLAG_vector_stores && !slot.IsInvalid());
|
| + DCHECK(!slot.IsInvalid());
|
| __ li(VectorStoreICTrampolineDescriptor::SlotRegister(),
|
| Operand(SmiFromSlot(slot)));
|
| }
|
|
|