From d180f6d6b737604665be915c6773a5082ef085aa Mon Sep 17 00:00:00 2001 From: "mjs@apple.com" Date: Fri, 3 Oct 2008 07:47:19 +0000 Subject: [PATCH] 2008-10-03 Maciej Stachowiak Rubber stamped by Cameron Zwarich. - fix mistaken change of | to || which caused a big perf regression on EarleyBoyer * kjs/grammar.y: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@37227 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- JavaScriptCore/ChangeLog | 8 ++++++++ JavaScriptCore/kjs/grammar.y | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog index e5b0d930b9c1..99a0286f3fb9 100644 --- a/JavaScriptCore/ChangeLog +++ b/JavaScriptCore/ChangeLog @@ -1,3 +1,11 @@ +2008-10-03 Maciej Stachowiak + + Rubber stamped by Cameron Zwarich. + + - fix mistaken change of | to || which caused a big perf regression on EarleyBoyer + + * kjs/grammar.y: + 2008-10-02 Darin Adler Reviewed by Geoff Garen. diff --git a/JavaScriptCore/kjs/grammar.y b/JavaScriptCore/kjs/grammar.y index 89a8b9fe205b..f6c65738eb90 100644 --- a/JavaScriptCore/kjs/grammar.y +++ b/JavaScriptCore/kjs/grammar.y @@ -1164,7 +1164,7 @@ FunctionDeclaration: FunctionExpr: FUNCTION '(' ')' OPENBRACE FunctionBody CLOSEBRACE { $$ = createNodeFeatureInfo(new FuncExprNode(GLOBAL_DATA, GLOBAL_DATA->propertyNames->nullIdentifier, $5, LEXER->sourceCode($4, $6, @4.first_line)), ClosureFeature, 0); DBG($5, @4, @6); } - | FUNCTION '(' FormalParameterList ')' OPENBRACE FunctionBody CLOSEBRACE { $$ = createNodeFeatureInfo(new FuncExprNode(GLOBAL_DATA, GLOBAL_DATA->propertyNames->nullIdentifier, $6, LEXER->sourceCode($5, $7, @5.first_line), $3.m_node.head), $3.m_featureInfo || ClosureFeature, 0); $6->setUsesArguments($6->usesArguments() | (($3.m_featureInfo & ArgumentsFeature) != 0)); DBG($6, @5, @7); } + | FUNCTION '(' FormalParameterList ')' OPENBRACE FunctionBody CLOSEBRACE { $$ = createNodeFeatureInfo(new FuncExprNode(GLOBAL_DATA, GLOBAL_DATA->propertyNames->nullIdentifier, $6, LEXER->sourceCode($5, $7, @5.first_line), $3.m_node.head), $3.m_featureInfo | ClosureFeature, 0); $6->setUsesArguments($6->usesArguments() || (($3.m_featureInfo & ArgumentsFeature) != 0)); DBG($6, @5, @7); } | FUNCTION IDENT '(' ')' OPENBRACE FunctionBody CLOSEBRACE { $$ = createNodeFeatureInfo(new FuncExprNode(GLOBAL_DATA, *$2, $6, LEXER->sourceCode($5, $7, @5.first_line)), ClosureFeature, 0); DBG($6, @5, @7); } | FUNCTION IDENT '(' FormalParameterList ')' OPENBRACE FunctionBody CLOSEBRACE { $$ = createNodeFeatureInfo(new FuncExprNode(GLOBAL_DATA, *$2, $7, LEXER->sourceCode($6, $8, @6.first_line), $4.m_node.head), $4.m_featureInfo | ClosureFeature, 0); $7->setUsesArguments($7->usesArguments() || (($4.m_featureInfo & ArgumentsFeature) != 0)); DBG($7, @6, @8); } ; -- 2.36.0