Changeset 286249 in webkit

Timestamp:

Nov 29, 2021, 11:55:59 AM (5 years ago)

Author:

ysuzuki@apple.com

Message:

[JSC] private name operation should use RETURN_IF_EXCEPTION
​https://bugs.webkit.org/show_bug.cgi?id=233577
rdar://85813869

Reviewed by Mark Lam.

JSTests:

• stress/termination-error-in-private-name.js: Added.

(C):

Source/JavaScriptCore:

Because of TerminatedExecutionError, error can be thrown at any time.

• jit/JITOperations.cpp:

(JSC::JSC_DEFINE_JIT_OPERATION):
(JSC::putPrivateNameOptimize):
(JSC::putPrivateName):

• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::LLINT_SLOW_PATH_DECL):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/termination-error-in-private-name.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/jit/JITOperations.cpp (modified) (4 diffs)
• Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2021-11-29  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] private name operation should use RETURN_IF_EXCEPTION
+        https://bugs.webkit.org/show_bug.cgi?id=233577
+        rdar://85813869
+
+        Reviewed by Mark Lam.
+
+        * stress/termination-error-in-private-name.js: Added.
+        (C):
+
 2021-11-29  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-11-29  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] private name operation should use RETURN_IF_EXCEPTION
+        https://bugs.webkit.org/show_bug.cgi?id=233577
+        rdar://85813869
+
+        Reviewed by Mark Lam.
+
+        Because of TerminatedExecutionError, error can be thrown at any time.
+
+        * jit/JITOperations.cpp:
+        (JSC::JSC_DEFINE_JIT_OPERATION):
+        (JSC::putPrivateNameOptimize):
+        (JSC::putPrivateName):
+        * llint/LLIntSlowPaths.cpp:
+        (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+
 2021-11-29  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/jit/JITOperations.cpp

@@ -529 +529 @@
     ASSERT(propertyValue.isSymbol());
     auto property = propertyValue.toPropertyKey(globalObject);
-    EXCEPTION_ASSERT(!scope.exception());
+    RETURN_IF_EXCEPTION(scope, { });
 
     PropertySlot slot(baseObject, PropertySlot::InternalMethodType::HasProperty);
@@ -563 +563 @@
     ASSERT(propertyValue.isSymbol());
     auto property = propertyValue.toPropertyKey(globalObject);
-    EXCEPTION_ASSERT(!scope.exception());
+    RETURN_IF_EXCEPTION(scope, { });
 
     return JSValue::encode(jsBoolean(asObject(baseValue)->hasPrivateField(globalObject, property)));
@@ -1325 +1325 @@
 
     auto propertyName = subscript.toPropertyKey(globalObject);
-    EXCEPTION_ASSERT(!scope.exception());
+    RETURN_IF_EXCEPTION(scope, void());
 
     // Private fields can only be accessed within class lexical scope
@@ -1359 +1359 @@
 
     auto propertyName = subscript.toPropertyKey(globalObject);
-    EXCEPTION_ASSERT(!scope.exception());
+    RETURN_IF_EXCEPTION(scope, void());
 
     scope.release();

trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp

@@ -1469 +1469 @@
     ASSERT(propertyValue.isSymbol());
     auto property = propertyValue.toPropertyKey(globalObject);
-    EXCEPTION_ASSERT(!throwScope.exception());
+    LLINT_CHECK_EXCEPTION();
 
     LLINT_RETURN(jsBoolean(asObject(baseValue)->hasPrivateField(globalObject, property)));