Changeset 206408 in webkit for trunk/Source/JavaScriptCore/API/JSObjectRef.cpp

Timestamp:

Sep 26, 2016, 7:46:19 PM (9 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r206405.
​https://bugs.webkit.org/show_bug.cgi?id=162588

This change caused LayoutTest crashes. (Requested by
ryanhaddad on #webkit).

Reverted changeset:

"Add some needed CatchScopes in code that should not throw."
​https://bugs.webkit.org/show_bug.cgi?id=162584
​http://trac.webkit.org/changeset/206405

File:

• trunk/Source/JavaScriptCore/API/JSObjectRef.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/API/JSObjectRef.cpp

@@ -310 +310 @@
     }
     ExecState* exec = toJS(ctx);
-    VM& vm = exec->vm();
-    JSLockHolder locker(vm);
-    auto scope = DECLARE_CATCH_SCOPE(vm);
+    JSLockHolder locker(exec);
 
     JSObject* jsObject = toJS(object);
@@ -318 +316 @@
     JSValue jsValue = toJS(exec, value);
 
-    bool doesNotHaveProperty = attributes && !jsObject->hasProperty(exec, name);
-    if (LIKELY(!scope.exception())) {
-        if (doesNotHaveProperty) {
-            PropertyDescriptor desc(jsValue, attributes);
-            jsObject->methodTable()->defineOwnProperty(jsObject, exec, name, desc, false);
-        } else {
-            PutPropertySlot slot(jsObject);
-            jsObject->methodTable()->put(jsObject, exec, name, jsValue, slot);
-        }
-    }
+    if (attributes && !jsObject->hasProperty(exec, name)) {
+        PropertyDescriptor desc(jsValue, attributes);
+        jsObject->methodTable()->defineOwnProperty(jsObject, exec, name, desc, false);
+    } else {
+        PutPropertySlot slot(jsObject);
+        jsObject->methodTable()->put(jsObject, exec, name, jsValue, slot);
+    }
+
     handleExceptionIfNeeded(exec, exception);
 }