Changeset 287624 in webkit

Timestamp:

Jan 5, 2022, 10:20:53 AM (5 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r286249. rdar://problem/87124979

[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):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@286249 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-612-branch

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)

branches/safari-612-branch/JSTests/ChangeLog

@@ +1 @@
+2022-01-05  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r286249. rdar://problem/87124979
+
+    [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):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@286249 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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):
+
 2022-01-05  Russell Epstein  <repstein@apple.com>
 

branches/safari-612-branch/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2022-01-05  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r286249. rdar://problem/87124979
+
+    [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):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@286249 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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):
+
 2022-01-05  Russell Epstein  <repstein@apple.com>
 

branches/safari-612-branch/Source/JavaScriptCore/jit/JITOperations.cpp

@@ -528 +528 @@
     ASSERT(propertyValue.isSymbol());
     auto property = propertyValue.toPropertyKey(globalObject);
-    EXCEPTION_ASSERT(!scope.exception());
+    RETURN_IF_EXCEPTION(scope, { });
 
     PropertySlot slot(baseObject, PropertySlot::InternalMethodType::HasProperty);
@@ -562 +562 @@
     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)));
@@ -1324 +1324 @@
 
     auto propertyName = subscript.toPropertyKey(globalObject);
-    EXCEPTION_ASSERT(!scope.exception());
+    RETURN_IF_EXCEPTION(scope, void());
 
     // Private fields can only be accessed within class lexical scope
@@ -1358 +1358 @@
 
     auto propertyName = subscript.toPropertyKey(globalObject);
-    EXCEPTION_ASSERT(!scope.exception());
+    RETURN_IF_EXCEPTION(scope, void());
 
     scope.release();

branches/safari-612-branch/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp

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