Revision: 20440
Author:   [email protected]
Date:     Wed Apr  2 14:47:26 2014 UTC
Log:      Fix assert in Runtime_SetIsObserved.

[email protected]
BUG=chromium:352664
LOG=N

Review URL: https://codereview.chromium.org/204493002
http://code.google.com/p/v8/source/detail?r=20440

Modified:
 /branches/bleeding_edge/src/objects.cc
 /branches/bleeding_edge/src/runtime.cc

=======================================
--- /branches/bleeding_edge/src/objects.cc      Wed Apr  2 13:30:36 2014 UTC
+++ /branches/bleeding_edge/src/objects.cc      Wed Apr  2 14:47:26 2014 UTC
@@ -5645,11 +5645,9 @@


 void JSObject::SetObserved(Handle<JSObject> object) {
+  ASSERT(!object->map()->is_observed());
   Isolate* isolate = object->GetIsolate();

-  if (object->map()->is_observed())
-    return;
-
   LookupResult result(isolate);
   object->map()->LookupTransition(*object,
                                   isolate->heap()->observed_symbol(),
=======================================
--- /branches/bleeding_edge/src/runtime.cc      Wed Apr  2 13:30:36 2014 UTC
+++ /branches/bleeding_edge/src/runtime.cc      Wed Apr  2 14:47:26 2014 UTC
@@ -14882,8 +14882,6 @@
   if (obj->IsJSProxy())
     return isolate->heap()->undefined_value();

-  ASSERT(!(obj->map()->is_observed() && obj->IsJSObject() &&
-           Handle<JSObject>::cast(obj)->HasFastElements()));
   ASSERT(obj->IsJSObject());
   JSObject::SetObserved(Handle<JSObject>::cast(obj));
   return isolate->heap()->undefined_value();

--
--
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