Index: src/arm/lithium-codegen-arm.cc |
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc |
index ae134f77ecdd9f700181ba2bd8374b8acfff3c48..4ac2ff0bc4815924f603ceef219ee7c396c16ff4 100644 |
--- a/src/arm/lithium-codegen-arm.cc |
+++ b/src/arm/lithium-codegen-arm.cc |
@@ -87,7 +87,20 @@ void LCodeGen::FinishCode(Handle<Code> code) { |
RegisterDependentCodeForEmbeddedMaps(code); |
} |
PopulateDeoptimizationData(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); |
+ } |
} |
@@ -4240,6 +4253,9 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) { |
} |
if (!transition.is_null()) { |
+ if (transition->CanBeDeprecated()) { |
+ transition_maps_.Add(transition, info()->zone()); |
+ } |
__ mov(scratch, Operand(transition)); |
__ str(scratch, FieldMemOperand(object, HeapObject::kMapOffset)); |
if (instr->hydrogen()->NeedsWriteBarrierForMap()) { |
@@ -5352,7 +5368,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(prototype_reg, prototypes->at(i)); |
__ ldr(map_reg, FieldMemOperand(prototype_reg, HeapObject::kMapOffset)); |