Changeset 170034 in webkit for trunk/Source/JavaScriptCore/runtime/Executable.cpp

Timestamp:

Jun 16, 2014, 4:19:29 PM (11 years ago)

Author:

[email protected]

Message:

Parser statementDepth accounting needs to account for when a function body excludes its braces.
<​https://webkit.org/b/133832>

Reviewed by Oliver Hunt.

Source/JavaScriptCore:
In some cases (e.g. when a Function object is instantiated from a string), the
function body source may not include its braces. The parser needs to account
for this when calculating its statementDepth.

• bytecode/UnlinkedCodeBlock.cpp:

(JSC::generateFunctionCodeBlock):
(JSC::UnlinkedFunctionExecutable::codeBlockFor):

• bytecode/UnlinkedCodeBlock.h:
• parser/Parser.cpp:

(JSC::Parser<LexerType>::parseStatement):

• Also fixed the error message for declaring nested functions in strict mode to be more accurate.
• parser/Parser.h:

(JSC::Parser<LexerType>::parse):
(JSC::parse):

• runtime/Executable.cpp:

(JSC::ScriptExecutable::newCodeBlockFor):

LayoutTests:

• js/parser-syntax-check-expected.txt:
• js/script-tests/parser-syntax-check.js:
  • Added cases for declaring functions in strict mode.
  • Added caught error to the test result logging if it's not a SyntaxError. This helps catch the issue in this bug which was erroneously throwing RangeErrors.

File:

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

trunk/Source/JavaScriptCore/runtime/Executable.cpp

@@ -224 +224 @@
     UnlinkedFunctionCodeBlock* unlinkedCodeBlock =
         executable->m_unlinkedExecutable->codeBlockFor(
-            *vm, executable->m_source, kind, debuggerMode, profilerMode, error);
+            *vm, executable->m_source, kind, debuggerMode, profilerMode, executable->bodyIncludesBraces(), error);
     recordParse(executable->m_unlinkedExecutable->features(), executable->m_unlinkedExecutable->hasCapturedVariables(), lineNo(), lastLine(), startColumn(), endColumn()); 
     if (!unlinkedCodeBlock) {