Changeset 276162 in webkit

Timestamp:

Apr 16, 2021, 12:59:33 PM (4 years ago)

Author:

mark.lam@apple.com

Message:

More changes to support the TerminationException.
​https://bugs.webkit.org/show_bug.cgi?id=224681
rdar://76698113

Reviewed by Keith Miller.

• interpreter/Interpreter.cpp:

(JSC::Interpreter::executeProgram):

• ProgramExecutable::initializeGlobalProperties() can throw the TerminationException. Add handling for that.

• runtime/JSObject.cpp:

(JSC::JSObject::defineOwnIndexedProperty):

• JSObject::defineOwnIndexedProperty() has a blob of assertion code that it verifying that getOwnPropertyDescriptor() should succeed without throwing any exceptions if the fast path is allowed. However, this is assertion is only true if there isn't a termination being requested. So, use the DeferTermination scope to allow this assertion to be tested without the complication of a TerminationException.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• interpreter/Interpreter.cpp (modified) (1 diff)
• runtime/JSObject.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-04-16  Mark Lam  <mark.lam@apple.com>
+
+        More changes to support the TerminationException.
+        https://bugs.webkit.org/show_bug.cgi?id=224681
+        rdar://76698113
+
+        Reviewed by Keith Miller.
+
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::executeProgram):
+        - ProgramExecutable::initializeGlobalProperties() can throw the TerminationException.
+          Add handling for that.
+
+        * runtime/JSObject.cpp:
+        (JSC::JSObject::defineOwnIndexedProperty):
+        - JSObject::defineOwnIndexedProperty() has a blob of assertion code that it verifying
+          that getOwnPropertyDescriptor() should succeed without throwing any exceptions if
+          the fast path is allowed.  However, this is assertion is only true if there isn't
+          a termination being requested.  So, use the DeferTermination scope to allow this
+          assertion to be tested without the complication of a TerminationException.
+
 2021-04-16  Keith Miller  <keith_miller@apple.com>
 

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -798 +798 @@
     // Compile source to bytecode if necessary:
     JSObject* error = program->initializeGlobalProperties(vm, globalObject, scope);
-    EXCEPTION_ASSERT(!throwScope.exception() || !error);
+    EXCEPTION_ASSERT(!throwScope.exception() || !error || vm.isTerminationException(throwScope.exception()));
+    RETURN_IF_EXCEPTION(throwScope, checkedReturn(throwScope.exception()));
     if (UNLIKELY(error))
         return checkedReturn(throwException(globalObject, throwScope, error));

trunk/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -2626 +2626 @@
 #if ASSERT_ENABLED
         if (canGetIndexQuickly(index) && canDoFastPutDirectIndex(vm, this)) {
+            DeferTermination deferScope(vm);
             PropertyDescriptor currentDescriptor;
             ASSERT(getOwnPropertyDescriptor(globalObject, Identifier::from(vm, index), currentDescriptor));