From: ulan@chromium.org <ulan@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Tue, 29 Apr 2014 12:32:38 +0000 (+0000)
Subject: Do not make objects in optimized code weak if collecting maps is disabled.
X-Git-Tag: upstream/4.7.83~9361
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c84cfec5f2e44b939b3ddc99d5d5c13689dc187;p=platform%2Fupstream%2Fv8.git

Do not make objects in optimized code weak if collecting maps is disabled.

When collecting maps is disabled we do not clear non-live references.

BUG=
R=ishell@chromium.org

Review URL: https://codereview.chromium.org/258163003

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@21044 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---

diff --git a/src/objects-inl.h b/src/objects-inl.h
index 5aea3b5..ddeaede 100644
--- a/src/objects-inl.h
+++ b/src/objects-inl.h
@@ -4808,9 +4808,9 @@ Object* Code::GetObjectFromEntryAddress(Address location_of_address) {
 
 
 bool Code::IsWeakObjectInOptimizedCode(Object* object) {
+  if (!FLAG_collect_maps) return false;
   if (object->IsMap()) {
     return Map::cast(object)->CanTransition() &&
-           FLAG_collect_maps &&
            FLAG_weak_embedded_maps_in_optimized_code;
   }
   if (object->IsJSObject() ||