Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index bbecdcc9f7f86f0f0fa69c1469d19e7dfc9ecd33..9647c3c5207c67e0c4cacf605be913e7353a33da 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -109,7 +109,20 @@ void LCodeGen::FinishCode(Handle<Code> code) { |
if (!info()->IsStub()) { |
Deoptimizer::EnsureRelocSpaceForLazyDeoptimization(code); |
} |
- info()->CommitDependentMaps(code); |
+ for (int i = 0 ; i < prototype_maps_.length(); i++) { |
+ prototype_maps_.at(i)->AddDependentCode( |
+ DependentCode::kPrototypeCheckGroup, code); |
+ } |
+ for (int i = 0 ; i < transition_maps_.length(); i++) { |
+ transition_maps_.at(i)->AddDependentCode( |
+ DependentCode::kTransitionGroup, code); |
+ } |
+ if (graph()->depends_on_empty_array_proto_elements()) { |
+ isolate()->initial_object_prototype()->map()->AddDependentCode( |
+ DependentCode::kElementsCantBeAddedGroup, code); |
+ isolate()->initial_array_prototype()->map()->AddDependentCode( |
+ DependentCode::kElementsCantBeAddedGroup, code); |
+ } |
} |
@@ -4302,6 +4315,9 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) { |
} |
if (!transition.is_null()) { |
+ if (transition->CanBeDeprecated()) { |
+ transition_maps_.Add(transition, info()->zone()); |
+ } |
if (!instr->hydrogen()->NeedsWriteBarrierForMap()) { |
__ mov(FieldOperand(object, HeapObject::kMapOffset), transition); |
} else { |
@@ -5977,7 +5993,11 @@ void LCodeGen::DoCheckPrototypeMaps(LCheckPrototypeMaps* instr) { |
ASSERT(prototypes->length() == maps->length()); |
- if (!instr->hydrogen()->CanOmitPrototypeChecks()) { |
+ if (instr->hydrogen()->CanOmitPrototypeChecks()) { |
+ for (int i = 0; i < maps->length(); i++) { |
+ prototype_maps_.Add(maps->at(i), info()->zone()); |
+ } |
+ } else { |
for (int i = 0; i < prototypes->length(); i++) { |
__ LoadHeapObject(reg, prototypes->at(i)); |
DoCheckMapCommon(reg, maps->at(i), instr); |