From: bmeurer@chromium.org <bmeurer@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Wed, 23 Apr 2014 09:41:28 +0000 (+0000)
Subject: Fix tracking of computed fields when field type tracking is disabled.
X-Git-Tag: upstream/4.7.83~9487
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a504406aa8842238ac8de8e1b6fa069e01774591;p=platform%2Fupstream%2Fv8.git

Fix tracking of computed fields when field type tracking is disabled.

R=svenpanne@chromium.org

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

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

diff --git a/src/objects.cc b/src/objects.cc
index ba5280e..6a79315 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -63,8 +63,8 @@ namespace internal {
 
 Handle<HeapType> Object::OptimalType(Isolate* isolate,
                                      Representation representation) {
+  if (representation.IsNone()) return HeapType::None(isolate);
   if (FLAG_track_field_types) {
-    if (representation.IsNone()) return HeapType::None(isolate);
     if (representation.IsHeapObject() && IsHeapObject()) {
       // We can track only JavaScript objects with stable maps.
       Handle<Map> map(HeapObject::cast(this)->map(), isolate);