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

Timestamp:

Aug 8, 2017, 5:26:04 PM (8 years ago)

Author:

[email protected]

Message:

Make JSC_validateExceptionChecks=1 succeed on JSTests/slowMicrobenchmarks/spread-small-array.js.
​https://bugs.webkit.org/show_bug.cgi?id=175347

Patch by Robin Morisset <​[email protected]> on 2017-08-08
Reviewed by Saam Barati.

This is done by making finishCreation explicitely check for exceptions after setConstantRegister and setConstantIdentifiersSetRegisters.
I chose to have this check replace the boolean returned previously by these functions for readability. The performance impact should be
negligible considering how much more finishCreation does.
This fix then caused another issue to appear as it was now clear that finishCreation can throw. And since it is called by ProgramCodeBlock::create(),
FunctionCodeBlock::create() and friends, that are in turn called by ScriptExecutable::newCodeBlockFor, this last function also required a few tweaks.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::finishCreation):
(JSC::CodeBlock::setConstantIdentifierSetRegisters):
(JSC::CodeBlock::setConstantRegisters):

• bytecode/CodeBlock.h:
• runtime/ScriptExecutable.cpp:

(JSC::ScriptExecutable::newCodeBlockFor):

File:

• trunk/Source/JavaScriptCore/runtime/ScriptExecutable.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/runtime/ScriptExecutable.cpp

@@ -188 +188 @@
             executable, executable->m_unlinkedEvalCodeBlock.get(), scope,
             executable->source().provider());
+        ASSERT(throwScope.exception() || codeBlock);
         if (!codeBlock) {
             exception = throwException(
@@ -205 +206 @@
             executable, executable->m_unlinkedProgramCodeBlock.get(), scope,
             executable->source().provider(), startColumn());
+        ASSERT(throwScope.exception() || codeBlock);
         if (!codeBlock) {
             exception = throwException(
@@ -222 +224 @@
             executable, executable->m_unlinkedModuleProgramCodeBlock.get(), scope,
             executable->source().provider(), startColumn());
+        ASSERT(throwScope.exception() || codeBlock);
         if (!codeBlock) {
             exception = throwException(
@@ -252 +255 @@
     }
 
+    throwScope.release();
     return FunctionCodeBlock::create(vm, executable, unlinkedCodeBlock, scope, 
         source().provider(), source().startOffset(), startColumn());