Index: src/arm/lithium-codegen-arm.cc |
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc |
index e4d816a5d46b201bc7f2e90c679ce2fec025f523..b9f1a5ff3479fcde19e8bfd23b7011eda3576b68 100644 |
--- a/src/arm/lithium-codegen-arm.cc |
+++ b/src/arm/lithium-codegen-arm.cc |
@@ -84,9 +84,7 @@ void LCodeGen::FinishCode(Handle<Code> code) { |
ASSERT(is_done()); |
code->set_stack_slots(GetStackSlotCount()); |
code->set_safepoint_table_offset(safepoints_.GetCodeOffset()); |
- if (FLAG_weak_embedded_maps_in_optimized_code) { |
- RegisterDependentCodeForEmbeddedMaps(code); |
- } |
+ RegisterDependentCodeForEmbeddedMaps(code); |
PopulateDeoptimizationData(code); |
info()->CommitDependencies(code); |
} |
@@ -887,36 +885,6 @@ void LCodeGen::DeoptimizeIf(Condition condition, |
} |
-void LCodeGen::RegisterDependentCodeForEmbeddedMaps(Handle<Code> code) { |
- ZoneList<Handle<Map> > maps(1, zone()); |
- ZoneList<Handle<JSObject> > objects(1, zone()); |
- int mode_mask = RelocInfo::ModeMask(RelocInfo::EMBEDDED_OBJECT); |
- for (RelocIterator it(*code, mode_mask); !it.done(); it.next()) { |
- if (Code::IsWeakEmbeddedObject(code->kind(), it.rinfo()->target_object())) { |
- if (it.rinfo()->target_object()->IsMap()) { |
- Handle<Map> map(Map::cast(it.rinfo()->target_object())); |
- maps.Add(map, zone()); |
- } else if (it.rinfo()->target_object()->IsJSObject()) { |
- Handle<JSObject> object(JSObject::cast(it.rinfo()->target_object())); |
- objects.Add(object, zone()); |
- } |
- } |
- } |
-#ifdef VERIFY_HEAP |
- // This disables verification of weak embedded objects after full GC. |
- // AddDependentCode can cause a GC, which would observe the state where |
- // this code is not yet in the depended code lists of the embedded maps. |
- NoWeakObjectVerificationScope disable_verification_of_embedded_objects; |
-#endif |
- for (int i = 0; i < maps.length(); i++) { |
- maps.at(i)->AddDependentCode(DependentCode::kWeaklyEmbeddedGroup, code); |
- } |
- for (int i = 0; i < objects.length(); i++) { |
- AddWeakObjectToCodeDependency(isolate()->heap(), objects.at(i), code); |
- } |
-} |
- |
- |
void LCodeGen::PopulateDeoptimizationData(Handle<Code> code) { |
int length = deoptimizations_.length(); |
if (length == 0) return; |