Reviewers: danno,

Message:
PTAL

Description:
Fix generalization with callbacks.

BUG=352588
LOG=n

Please review this at https://codereview.chromium.org/200173003/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files (+9, -6 lines):
  M src/objects.cc
  A + test/mjsunit/regress/regress-migrate-callbacks.js


Index: src/objects.cc
diff --git a/src/objects.cc b/src/objects.cc
index 492f7528f0d4631558807e6c698dc42e0aca41e8..92e4dc4c8c9c98f03a6267e2f393dda5c4312803 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -2620,6 +2620,8 @@ Map* Map::FindUpdatedMap(int verbatim,
               current->instance_descriptors()->GetValue(i)) {
         return NULL;
       }
+    } else if (target_details.type() == CALLBACKS) {
+      return NULL;
     }
   }

Index: test/mjsunit/regress/regress-migrate-callbacks.js
diff --git a/test/mjsunit/regress/regress-347912.js b/test/mjsunit/regress/regress-migrate-callbacks.js
similarity index 61%
copy from test/mjsunit/regress/regress-347912.js
copy to test/mjsunit/regress/regress-migrate-callbacks.js
index b609e36c3d4981219abcd1c244ab46f849b2863b..b1979ea44207884d2554614c40e8cf67c753a4e8 100644
--- a/test/mjsunit/regress/regress-347912.js
+++ b/test/mjsunit/regress/regress-migrate-callbacks.js
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.

-// Flags: --allow-natives-syntax
-
-var __v_4 = {};
-__v_2 = {};
-__v_2[1024] = 0;
-%DebugPrint(__v_4);
+var o1 = {};
+o1.x = 1
+o1.y = 1.5
+var o2 = {}
+o2.x = 1.5;
+o2.__defineSetter__('y', function(v) { });
+o1.y;


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to