| Index: src/arm/full-codegen-arm.cc
|
| diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc
|
| index 369f7146eb1aef781c05f1f6252a5fc2e99ea17c..2622c386dae5705acfdc58b23df973cd2d13827e 100644
|
| --- a/src/arm/full-codegen-arm.cc
|
| +++ b/src/arm/full-codegen-arm.cc
|
| @@ -1194,7 +1194,8 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) {
|
|
|
| __ Move(r1, FeedbackVector());
|
| __ mov(r2, Operand(TypeFeedbackVector::MegamorphicSentinel(isolate())));
|
| - __ str(r2, FieldMemOperand(r1, FixedArray::OffsetOfElementAt(slot.ToInt())));
|
| + int vector_index = FeedbackVector()->GetIndex(slot);
|
| + __ str(r2, FieldMemOperand(r1, FixedArray::OffsetOfElementAt(vector_index)));
|
|
|
| __ mov(r1, Operand(Smi::FromInt(1))); // Smi indicates slow check
|
| __ ldr(r2, MemOperand(sp, 0 * kPointerSize)); // Get enumerated object
|
| @@ -2898,9 +2899,7 @@ void FullCodeGenerator::EmitCall(Call* expr, CallICState::CallType call_type) {
|
| isolate(), arg_count, call_type);
|
| __ mov(r3, Operand(SmiFromSlot(expr->CallFeedbackSlot())));
|
| __ ldr(r1, 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.
|
|
|