Changeset 208950 in webkit for trunk/Source/JavaScriptCore/runtime/ScriptExecutable.cpp

Timestamp:

Nov 21, 2016, 9:19:30 AM (9 years ago)

Author:

[email protected]

Message:

Fix exception scope verification failures in *Executable.cpp files.
​https://bugs.webkit.org/show_bug.cgi?id=164996

Reviewed by Darin Adler.

• runtime/DirectEvalExecutable.cpp:

(JSC::DirectEvalExecutable::create):

• runtime/IndirectEvalExecutable.cpp:

(JSC::IndirectEvalExecutable::create):

• runtime/ProgramExecutable.cpp:

(JSC::ProgramExecutable::initializeGlobalProperties):

• runtime/ScriptExecutable.cpp:

(JSC::ScriptExecutable::prepareForExecutionImpl):

File:

• trunk/Source/JavaScriptCore/runtime/ScriptExecutable.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/runtime/ScriptExecutable.cpp

@@ -308 +308 @@
     VM& vm, JSFunction* function, JSScope* scope, CodeSpecializationKind kind, CodeBlock*& resultCodeBlock)
 {
+    auto throwScope = DECLARE_THROW_SCOPE(vm);
     DeferGCForAWhile deferGC(vm.heap);
 
-    if (vm.getAndClearFailNextNewCodeBlock())
-        return createError(scope->globalObject()->globalExec(), ASCIILiteral("Forced Failure"));
-
-    JSObject* exception = 0;
+    if (vm.getAndClearFailNextNewCodeBlock()) {
+        auto& state = *scope->globalObject()->globalExec();
+        return throwException(&state, throwScope, createError(&state, ASCIILiteral("Forced Failure")));
+    }
+
+    JSObject* exception = nullptr;
     CodeBlock* codeBlock = newCodeBlockFor(kind, function, scope, exception);
     resultCodeBlock = codeBlock;
-    if (!codeBlock) {
-        RELEASE_ASSERT(exception);
+    ASSERT(!!throwScope.exception() == !codeBlock);
+    if (UNLIKELY(!codeBlock))
         return exception;
-    }
     
     if (Options::validateBytecode())