Changeset 220471 in webkit for trunk/Source/JavaScriptCore/jit/JITOperations.cpp

Timestamp:

Aug 9, 2017, 11:31:24 AM (8 years ago)

Author:

[email protected]

Message:

Make JSC_validateExceptionChecks=1 succeed on JSTests/stress/v8-deltablue-strict.js.
​https://bugs.webkit.org/show_bug.cgi?id=175358

Patch by Robin Morisset <​[email protected]> on 2017-08-09
Reviewed by Mark Lam.

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

(JSC::JSObject::putInlineForJSObject):

File:

• trunk/Source/JavaScriptCore/jit/JITOperations.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/jit/JITOperations.cpp

@@ -957 +957 @@
         ASSERT(throwScope.exception() == reinterpret_cast<Exception*>(error));
         if (error) {
-            throwException(exec, throwScope, error);
             return encodeResult(
                 vm->getCTIStub(throwExceptionFromCallSlowPathGenerator).code().executableAddress(),
@@ -1015 +1014 @@
         
         JSObject* error = functionExecutable->prepareForExecution<FunctionExecutable>(*vm, callee, scope, kind, codeBlock);
-        ASSERT(throwScope.exception() == reinterpret_cast<Exception*>(error));
-        if (error) {
-            throwException(exec, throwScope, error);
+        ASSERT_UNUSED(throwScope, throwScope.exception() == reinterpret_cast<Exception*>(error));
+        if (error)
             return;
-        }
         ArityCheckMode arity;
         unsigned argumentStackSlots = callLinkInfo->maxNumArguments();
@@ -1062 +1059 @@
         CodeBlock** codeBlockSlot = execCallee->addressOfCodeBlock();
         JSObject* error = functionExecutable->prepareForExecution<FunctionExecutable>(*vm, function, scope, kind, *codeBlockSlot);
+        ASSERT(throwScope.exception() == reinterpret_cast<Exception*>(error));
         if (error) {
-            throwException(exec, throwScope, error);
             return encodeResult(
                 vm->getCTIStub(throwExceptionFromCallSlowPathGenerator).code().executableAddress(),