From 56e8a26e097914ce7842322f9e72d7d44b4f56f0 Mon Sep 17 00:00:00 2001 From: "mstarzinger@chromium.org" Date: Wed, 2 Apr 2014 14:47:26 +0000 Subject: [PATCH] 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 --- src/objects.cc | 4 +--- src/runtime.cc | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/objects.cc b/src/objects.cc index 290eb60..f2a4010 100644 --- a/src/objects.cc +++ b/src/objects.cc @@ -5645,11 +5645,9 @@ Handle JSObject::Freeze(Handle object) { void JSObject::SetObserved(Handle 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 562848a..215c4eb 100644 --- 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::cast(obj)->HasFastElements())); ASSERT(obj->IsJSObject()); JSObject::SetObserved(Handle::cast(obj)); return isolate->heap()->undefined_value(); -- 2.7.4