Changeset 167964 in webkit for trunk/Source/JavaScriptCore/parser/Parser.cpp

Timestamp:

Apr 29, 2014, 3:23:17 PM (11 years ago)

Author:

[email protected]

Message:

Source/JavaScriptCore: Don't hold on to parameterBindingNodes forever
​https://bugs.webkit.org/show_bug.cgi?id=132360

Reviewed by Geoffrey Garen.

Don't keep the parameter nodes anymore. Instead we store the
original parameter string and reparse whenever we actually
need them. Because we only actually need them for compilation
this only results in a single extra parse.

• bytecode/UnlinkedCodeBlock.cpp:

(JSC::generateFunctionCodeBlock):
(JSC::UnlinkedFunctionExecutable::UnlinkedFunctionExecutable):
(JSC::UnlinkedFunctionExecutable::visitChildren):
(JSC::UnlinkedFunctionExecutable::finishCreation):
(JSC::UnlinkedFunctionExecutable::paramString):
(JSC::UnlinkedFunctionExecutable::parameters):
(JSC::UnlinkedFunctionExecutable::parameterCount): Deleted.

• bytecode/UnlinkedCodeBlock.h:

(JSC::UnlinkedFunctionExecutable::create):
(JSC::UnlinkedFunctionExecutable::parameterCount):
(JSC::UnlinkedFunctionExecutable::parameters): Deleted.
(JSC::UnlinkedFunctionExecutable::finishCreation): Deleted.

• parser/ASTBuilder.h:

(JSC::ASTBuilder::ASTBuilder):
(JSC::ASTBuilder::setFunctionBodyParameters):

• parser/Nodes.h:

(JSC::FunctionBodyNode::parametersStartOffset):
(JSC::FunctionBodyNode::parametersEndOffset):
(JSC::FunctionBodyNode::setParameterLocation):

• parser/Parser.cpp:

(JSC::Parser<LexerType>::parseFunctionInfo):
(JSC::parseParameters):

• parser/Parser.h:

(JSC::parse):

• parser/SourceCode.h:

(JSC::SourceCode::subExpression):

• parser/SyntaxChecker.h:

(JSC::SyntaxChecker::setFunctionBodyParameters):

LayoutTests: Don't hold on to parameter BindingNodes forever
​https://bugs.webkit.org/show_bug.cgi?id=132360

Reviewed by Geoffrey Garen.

We don't regenerate the parameter string anymore, so these tests now
match the original input.

• js/destructuring-assignment-expected.txt:

File:

• trunk/Source/JavaScriptCore/parser/Parser.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -1249 +1249 @@
         return false;
     }
+    JSTokenLocation openParen = tokenLocation();
     if (!consume(OPENPAREN)) {
         semanticFailureDueToKeyword(stringForFunctionMode(mode), " name");
@@ -1257 +1258 @@
         failIfFalse(parameters, "Cannot parse parameters for this ", stringForFunctionMode(mode));
     }
+    JSTokenLocation endParen = m_token.m_location;
     consumeOrFail(CLOSEPAREN, "Expected a ')' or a ',' after a parameter declaration");
     matchOrFail(OPENBRACE, "Expected an opening '{' at the start of a ", stringForFunctionMode(mode), " body");
@@ -1282 +1284 @@
 
         body = context.createFunctionBody(startLocation, endLocation, bodyStartColumn, bodyEndColumn, cachedInfo->strictMode);
-        
+        context.setFunctionBodyParameters(body, openParen, endParen);
         functionScope->restoreFromSourceProviderCache(cachedInfo);
         failIfFalse(popScope(functionScope, TreeBuilder::NeedsFreeVariableInfo), "Parser error");
@@ -1302 +1304 @@
     restoreState(oldState);
     failIfFalse(body, "Cannot parse the body of this ", stringForFunctionMode(mode));
+    context.setFunctionBodyParameters(body, openParen, endParen);
     if (functionScope->strictMode() && name) {
         RELEASE_ASSERT(mode == FunctionMode);
@@ -2405 +2408 @@
 }
 
+PassRefPtr<FunctionParameters> parseParameters(VM* vm, const SourceCode& source, JSParserStrictness strictness)
+{
+    SamplingRegion samplingRegion("Parsing parameters");
+    ParameterNode* parameters = 0;
+    ASSERT(!source.provider()->source().isNull());
+    if (source.provider()->source().is8Bit()) {
+        Parser<Lexer<LChar>> parser(vm, source, 0, Identifier(), strictness, JSParseFunctionCode);
+        ASTBuilder builder(vm, &source);
+        parameters = parser.parseFormalParameters(builder);
+    } else {
+        Parser<Lexer<UChar>> parser(vm, source, 0, Identifier(), strictness, JSParseFunctionCode);
+        ASTBuilder builder(vm, &source);
+        parameters = parser.parseFormalParameters(builder);
+    }
+    if (!parameters)
+        return nullptr;
+    return FunctionParameters::create(parameters);
+}
+
 // Instantiate the two flavors of Parser we need instead of putting most of this file in Parser.h
 template class Parser<Lexer<LChar>>;