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

Timestamp:

May 1, 2014, 10:26:24 AM (11 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r167964.
​https://bugs.webkit.org/show_bug.cgi?id=132431

Memory improvements should not regress memory usage (Requested
by olliej on #webkit).

Reverted changeset:

"Don't hold on to parameter BindingNodes forever"
​https://bugs.webkit.org/show_bug.cgi?id=132360
​http://trac.webkit.org/changeset/167964

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");
@@ -1258 +1257 @@
         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");
@@ -1284 +1282 @@
 
         body = context.createFunctionBody(startLocation, endLocation, bodyStartColumn, bodyEndColumn, cachedInfo->strictMode);
-        context.setFunctionBodyParameters(body, openParen, endParen);
+        
         functionScope->restoreFromSourceProviderCache(cachedInfo);
         failIfFalse(popScope(functionScope, TreeBuilder::NeedsFreeVariableInfo), "Parser error");
@@ -1304 +1302 @@
     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);
@@ -2408 +2405 @@
 }
 
-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>>;