| Index: src/full-codegen/x87/full-codegen-x87.cc
|
| diff --git a/src/full-codegen/x87/full-codegen-x87.cc b/src/full-codegen/x87/full-codegen-x87.cc
|
| index 93e9a9977e47e51970cc40e8a7b555e84bb2b197..dac40d519f5bd9a2b1509c5a6691f7d14a664b49 100644
|
| --- a/src/full-codegen/x87/full-codegen-x87.cc
|
| +++ b/src/full-codegen/x87/full-codegen-x87.cc
|
| @@ -1039,8 +1039,8 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) {
|
| __ bind(&fixed_array);
|
|
|
| // No need for a write barrier, we are storing a Smi in the feedback vector.
|
| + int const vector_index = SmiFromSlot(slot)->value();
|
| __ EmitLoadTypeFeedbackVector(ebx);
|
| - int vector_index = SmiFromSlot(slot)->value();
|
| __ mov(FieldOperand(ebx, FixedArray::OffsetOfElementAt(vector_index)),
|
| Immediate(TypeFeedbackVector::MegamorphicSentinel(isolate())));
|
| __ push(Immediate(Smi::FromInt(1))); // Smi(1) undicates slow check
|
| @@ -1073,6 +1073,16 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) {
|
| __ cmp(edx, FieldOperand(ecx, HeapObject::kMapOffset));
|
| __ j(equal, &update_each, Label::kNear);
|
|
|
| + // We might get here from TurboFan or Crankshaft when something in the
|
| + // for-in loop body deopts and only now notice in fullcodegen, that we
|
| + // can now longer use the enum cache, i.e. left fast mode. So better record
|
| + // this information here, in case we later OSR back into this loop or
|
| + // reoptimize the whole function w/o rerunning the loop with the slow
|
| + // mode object in fullcodegen (which would result in a deopt loop).
|
| + __ EmitLoadTypeFeedbackVector(edx);
|
| + __ mov(FieldOperand(edx, FixedArray::OffsetOfElementAt(vector_index)),
|
| + Immediate(TypeFeedbackVector::MegamorphicSentinel(isolate())));
|
| +
|
| // Convert the entry to a string or null if it isn't a property
|
| // anymore. If the property has been removed while iterating, we
|
| // just skip it.
|
|
|