Changeset 231976 in webkit

Timestamp:

May 18, 2018 11:55:35 AM (6 years ago)

Author:

Yusuke Suzuki

Message:

Unreviewed, fix exception checking, part 2
​https://bugs.webkit.org/show_bug.cgi?id=185350

• dfg/DFGOperations.cpp:

(JSC::DFG::putByValInternal):

• jit/JITOperations.cpp:
• runtime/CommonSlowPaths.h:

(JSC::CommonSlowPaths::putDirectAccessorWithReify):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGOperations.cpp (modified) (1 diff)
• jit/JITOperations.cpp (modified) (1 diff)
• runtime/CommonSlowPaths.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-05-18  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        Unreviewed, fix exception checking, part 2
+        https://bugs.webkit.org/show_bug.cgi?id=185350
+
+        * dfg/DFGOperations.cpp:
+        (JSC::DFG::putByValInternal):
+        * jit/JITOperations.cpp:
+        * runtime/CommonSlowPaths.h:
+        (JSC::CommonSlowPaths::putDirectAccessorWithReify):
+
 2018-05-16  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp

@@ -146 +146 @@
             return;
         }
+        scope.release();
         CommonSlowPaths::putDirectWithReify(vm, exec, baseObject, propertyName, value, slot);
         return;

trunk/Source/JavaScriptCore/jit/JITOperations.cpp

@@ -712 +712 @@
         byValInfo->tookSlowPath = true;
 
+    scope.release();
     PutPropertySlot slot(baseObject, isStrictMode);
     CommonSlowPaths::putDirectWithReify(vm, callFrame, baseObject, property, value, slot);

trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h

@@ -243 +243 @@
     auto scope = DECLARE_THROW_SCOPE(vm);
     if (baseObject->inherits<JSFunction>(vm)) {
-        auto scope = DECLARE_THROW_SCOPE(vm);
         jsCast<JSFunction*>(baseObject)->reifyLazyPropertyIfNeeded(vm, exec, propertyName);
         RETURN_IF_EXCEPTION(scope, void());