Changeset 75408 in webkit for trunk/Source/JavaScriptCore/parser/JSParser.h

Timestamp:

Jan 10, 2011, 12:20:15 PM (14 years ago)

Author:

[email protected]

Message:

Bug 52079 - Syntax errors should be early errors.

Reviewed by Oliver Hunt.

Source/JavaScriptCore:

From chapter 16 the spec:

An implementation must report most errors at the time the relevant ECMAScript language construct is
evaluated. An early error is an error that can be detected and reported prior to the evaluation of
any construct in the Program containing the error. An implementation must report early errors in a
Program prior to the first evaluation of that Program. Early errors in eval code are reported at
the time eval is called but prior to evaluation of any construct within the eval code. All errors
that are not early errors are runtime errors.

An implementation must treat any instance of the following kinds of errors as an early error:

• Any syntax error."

• JavaScriptCore.xcodeproj/project.pbxproj:

Added new files.

• bytecode/CodeBlock.cpp:

Removed op_throw_syntax_error.

• bytecode/Opcode.h:

Removed op_throw_syntax_error.

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::generate):

If m_expressionTooDeep then throw a runtime error.

(JSC::BytecodeGenerator::BytecodeGenerator):

Initialize m_expressionTooDeep.

(JSC::BytecodeGenerator::emitThrowExpressionTooDeepException):

Sets m_expressionTooDeep.

• bytecompiler/BytecodeGenerator.h:

Added m_expressionTooDeep, removed emitThrowSyntaxError.

• bytecompiler/NodesCodegen.cpp:

(JSC::RegExpNode::emitBytecode):
(JSC::ContinueNode::emitBytecode):
(JSC::BreakNode::emitBytecode):
(JSC::ReturnNode::emitBytecode):
(JSC::LabelNode::emitBytecode):

Conditions that threw syntax error are now handled during parsing;
during bytecompilation these are now just ASSERTs.

• interpreter/Interpreter.cpp:

(JSC::Interpreter::privateExecute):

• jit/JIT.cpp:

(JSC::JIT::privateCompileMainPass):

• jit/JIT.h:
• jit/JITOpcodes.cpp:
• jit/JITOpcodes32_64.cpp:
• jit/JITStubs.cpp:
• jit/JITStubs.h:

Removed op_throw_syntax_error.

• parser/ASTBuilder.h:

(JSC::ASTBuilder::createRegExp):

Renamed; added syntax check.

• parser/JSParser.cpp:

(JSC::JSParser::breakIsValid):
(JSC::JSParser::hasLabel):
(JSC::JSParser::Scope::Scope):
(JSC::JSParser::Scope::setIsFunction):
(JSC::JSParser::Scope::isFunctionBoundary):
(JSC::JSParser::ScopeRef::hasContainingScope):
(JSC::JSParser::ScopeRef::containingScope):
(JSC::JSParser::AutoPopScopeRef::AutoPopScopeRef):
(JSC::JSParser::AutoPopScopeRef::~AutoPopScopeRef):
(JSC::JSParser::AutoPopScopeRef::setPopped):
(JSC::JSParser::popScopeInternal):
(JSC::JSParser::popScope):
(JSC::jsParse):
(JSC::JSParser::JSParser):
(JSC::JSParser::parseProgram):
(JSC::JSParser::parseBreakStatement):
(JSC::JSParser::parseContinueStatement):
(JSC::JSParser::parseReturnStatement):
(JSC::JSParser::parseTryStatement):
(JSC::JSParser::parseFunctionInfo):
(JSC::JSParser::parseExpressionOrLabelStatement):
(JSC::JSParser::parsePrimaryExpression):

• parser/JSParser.h:
• parser/Nodes.h:
• parser/Parser.cpp:

(JSC::Parser::parse):

• parser/SyntaxChecker.h:

(JSC::SyntaxChecker::createRegExp):

Renamed; added syntax check.

• runtime/ExceptionHelpers.cpp:

(JSC::createOutOfMemoryError):
(JSC::throwOutOfMemoryError):

• runtime/ExceptionHelpers.h:

Broke out createOutOfMemoryError.

• runtime/Executable.cpp:

(JSC::EvalExecutable::compileInternal):
(JSC::ProgramExecutable::compileInternal):
(JSC::FunctionExecutable::compileForCallInternal):
(JSC::FunctionExecutable::compileForConstructInternal):

Add check for exception after bytecode generation.

• runtime/RegExpConstructor.cpp:

(JSC::constructRegExp):

• runtime/RegExpPrototype.cpp:

(JSC::regExpProtoFuncCompile):

RegExp error prefixes not included in error string.

• yarr/RegexParser.h:

(JSC::Yarr::Parser::parse):

Removed regexBegin/regexEnd/regexError.

• yarr/RegexPattern.cpp:

(JSC::Yarr::RegexPatternConstructor::regexBegin):

Removed regexEnd/regexError.

(JSC::Yarr::compileRegex):

Add call to regexBegin (no longer called from the parser).

• yarr/YarrSyntaxChecker.cpp: Added.

(JSC::Yarr::SyntaxChecker::assertionBOL):
(JSC::Yarr::SyntaxChecker::assertionEOL):
(JSC::Yarr::SyntaxChecker::assertionWordBoundary):
(JSC::Yarr::SyntaxChecker::atomPatternCharacter):
(JSC::Yarr::SyntaxChecker::atomBuiltInCharacterClass):
(JSC::Yarr::SyntaxChecker::atomCharacterClassBegin):
(JSC::Yarr::SyntaxChecker::atomCharacterClassAtom):
(JSC::Yarr::SyntaxChecker::atomCharacterClassRange):
(JSC::Yarr::SyntaxChecker::atomCharacterClassBuiltIn):
(JSC::Yarr::SyntaxChecker::atomCharacterClassEnd):
(JSC::Yarr::SyntaxChecker::atomParenthesesSubpatternBegin):
(JSC::Yarr::SyntaxChecker::atomParentheticalAssertionBegin):
(JSC::Yarr::SyntaxChecker::atomParenthesesEnd):
(JSC::Yarr::SyntaxChecker::atomBackReference):
(JSC::Yarr::SyntaxChecker::quantifyAtom):
(JSC::Yarr::SyntaxChecker::disjunction):
(JSC::Yarr::checkSyntax):

• yarr/YarrSyntaxChecker.h: Added.

Check RegExp syntax.

LayoutTests:

Fix syntax errors in layout tests, and update expected results.

• editing/selection/select-crash-001.html:
• editing/selection/select-crash-002.html:
• fast/canvas/webgl/renderbuffer-initialization.html:
• fast/forms/25153.html:
• fast/forms/textfield-drag-into-disabled.html:
• fast/js/exception-codegen-crash-expected.txt:
• fast/js/exception-codegen-crash.html:
• fast/js/kde/parse-expected.txt:
• fast/js/kde/script-tests/parse.js:
• fast/js/large-expressions-expected.txt:
• fast/js/named-function-expression-expected.txt:
• fast/js/parser-syntax-check-expected.txt:
• fast/js/script-tests/large-expressions.js:
• fast/js/script-tests/named-function-expression.js:
• fast/js/script-tests/parser-syntax-check.js:
• fast/js/sputnik/Conformance/12_Statement/12.6_Iteration_Statements/12.6.3_The_for_Statement/S12.6.3_A11.1_T3-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.6_Iteration_Statements/12.6.3_The_for_Statement/S12.6.3_A11_T3-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.6_Iteration_Statements/12.6.3_The_for_Statement/S12.6.3_A12.1_T3-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.6_Iteration_Statements/12.6.3_The_for_Statement/S12.6.3_A12_T3-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.7_The_continue_Statement/S12.7_A1_T1-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.7_The_continue_Statement/S12.7_A1_T2-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.7_The_continue_Statement/S12.7_A1_T3-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.7_The_continue_Statement/S12.7_A1_T4-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.7_The_continue_Statement/S12.7_A5_T1-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.7_The_continue_Statement/S12.7_A5_T2-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.7_The_continue_Statement/S12.7_A5_T3-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.7_The_continue_Statement/S12.7_A6-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.7_The_continue_Statement/S12.7_A8_T1-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.7_The_continue_Statement/S12.7_A8_T2-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.8_The_break_Statement/S12.8_A1_T1-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.8_The_break_Statement/S12.8_A1_T2-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.8_The_break_Statement/S12.8_A1_T3-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.8_The_break_Statement/S12.8_A1_T4-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.8_The_break_Statement/S12.8_A5_T1-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.8_The_break_Statement/S12.8_A5_T2-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.8_The_break_Statement/S12.8_A5_T3-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.8_The_break_Statement/S12.8_A6-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.8_The_break_Statement/S12.8_A8_T1-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.8_The_break_Statement/S12.8_A8_T2-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.9_The_return_Statement/S12.9_A1_T1-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.9_The_return_Statement/S12.9_A1_T10-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.9_The_return_Statement/S12.9_A1_T2-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.9_The_return_Statement/S12.9_A1_T3-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.9_The_return_Statement/S12.9_A1_T4-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.9_The_return_Statement/S12.9_A1_T5-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.9_The_return_Statement/S12.9_A1_T6-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.9_The_return_Statement/S12.9_A1_T7-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.9_The_return_Statement/S12.9_A1_T8-expected.txt:
• fast/js/sputnik/Conformance/12_Statement/12.9_The_return_Statement/S12.9_A1_T9-expected.txt:
• http/tests/security/isolatedWorld/events.html:
• http/tests/security/isolatedWorld/userGestureEvents.html:
• svg/custom/resources/use-instanceRoot-event-listeners.js:
• svg/custom/rgbcolor-syntax.svg:
• svg/custom/use-instanceRoot-modifications.svg:
• svg/custom/use-property-changes-through-svg-dom.svg:
• webarchive/adopt-attribute-styled-body-webarchive-expected.webarchive:
• webarchive/resources/adopt-attribute-styled-body-iframe.html:

File:

• trunk/Source/JavaScriptCore/parser/JSParser.h (modified) (1 diff)

trunk/Source/JavaScriptCore/parser/JSParser.h

@@ -160 +160 @@
 enum JSParserMode { JSParseProgramCode, JSParseFunctionCode };
 
-int jsParse(JSGlobalData*, FunctionParameters*, JSParserStrictness, JSParserMode, const SourceCode*);
+const char* jsParse(JSGlobalData*, FunctionParameters*, JSParserStrictness, JSParserMode, const SourceCode*);
 }
 #endif // JSParser_h