Fix assert in Runtime_SetIsObserved.

R=rafaelw@chromium.org
BUG=chromium:352664
LOG=N

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

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

diff --git a/src/objects.cc b/src/objects.cc
index 290eb6059deddce596b2b5c0d0df54f1a487ce39..f2a4010ae34746e249bb78a6eb921ba47e2c2f09 100644 (file)
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -5645,11 +5645,9 @@ Handle<Object> JSObject::Freeze(Handle<JSObject> object) {
 
 
 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(),

diff --git a/src/runtime.cc b/src/runtime.cc
index 562848a8f4100bf45564900f833982132efb0f56..215c4ebf5c12f3e7bb1765b3146f6175f7a1cd17 100644 (file)
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -14882,8 +14882,6 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_SetIsObserved) {
   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();