Index: src/mips/full-codegen-mips.cc |
diff --git a/src/mips/full-codegen-mips.cc b/src/mips/full-codegen-mips.cc |
index f7c13c84525d982db51e9402b84c11f6d31edb5a..d4d1ba14f4f60e64c917d2fab6ec420de60e6089 100644 |
--- a/src/mips/full-codegen-mips.cc |
+++ b/src/mips/full-codegen-mips.cc |
@@ -1181,7 +1181,8 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) { |
__ li(a1, FeedbackVector()); |
__ li(a2, Operand(TypeFeedbackVector::MegamorphicSentinel(isolate()))); |
- __ sw(a2, FieldMemOperand(a1, FixedArray::OffsetOfElementAt(slot.ToInt()))); |
+ int vector_index = FeedbackVector()->GetIndex(slot); |
+ __ sw(a2, FieldMemOperand(a1, FixedArray::OffsetOfElementAt(vector_index))); |
__ li(a1, Operand(Smi::FromInt(1))); // Smi indicates slow check |
__ lw(a2, MemOperand(sp, 0 * kPointerSize)); // Get enumerated object |
@@ -2873,9 +2874,7 @@ void FullCodeGenerator::EmitCall(Call* expr, CallICState::CallType call_type) { |
isolate(), arg_count, call_type); |
__ li(a3, Operand(SmiFromSlot(expr->CallFeedbackSlot()))); |
__ lw(a1, MemOperand(sp, (arg_count + 1) * kPointerSize)); |
- // Don't assign a type feedback id to the IC, since type feedback is provided |
- // by the vector above. |
- CallIC(ic); |
+ CallIC(ic, TypeFeedbackId(expr->CallFeedbackSlot().ToInt())); |
RecordJSReturnSite(expr); |
// Restore context register. |