Changeset 167964 in webkit for trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.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/bytecode/UnlinkedCodeBlock.cpp (modified) (6 diffs)

trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp

@@ -52 +52 @@
 static UnlinkedFunctionCodeBlock* generateFunctionCodeBlock(VM& vm, UnlinkedFunctionExecutable* executable, const SourceCode& source, CodeSpecializationKind kind, DebuggerMode debuggerMode, ProfilerMode profilerMode, UnlinkedFunctionKind functionKind, ParserError& error)
 {
-    RefPtr<FunctionBodyNode> body = parse<FunctionBodyNode>(&vm, source, executable->parameters(), executable->name(), executable->toStrictness(), JSParseFunctionCode, error);
+    RefPtr<FunctionParameters> parameters = executable->parameters(&vm);
+    if (!parameters) {
+        error = ParserError(ParserError::StackOverflow);
+        error.m_line = source.firstLine();
+        return 0;
+    }
+
+    RefPtr<FunctionBodyNode> body = parse<FunctionBodyNode>(&vm, source, parameters.get(), executable->name(), executable->toStrictness(), JSParseFunctionCode, error);
 
     if (!body) {
@@ -61 +68 @@
     if (executable->forceUsesArguments())
         body->setUsesArguments();
-    body->finishParsing(executable->parameters(), executable->name(), executable->functionMode());
+    body->finishParsing(parameters.get(), executable->name(), executable->functionMode());
     executable->recordParse(body->features(), body->hasCapturedVariables());
     
@@ -93 +100 @@
     , m_name(node->ident())
     , m_inferredName(node->inferredName())
-    , m_parameters(node->parameters())
+    , m_parameterCount(node->parameterCount())
     , m_firstLineOffset(node->firstLine() - source.firstLine())
     , m_lineCount(node->lastLine() - node->firstLine())
@@ -104 +111 @@
     , m_functionMode(node->functionMode())
 {
-}
-
-size_t UnlinkedFunctionExecutable::parameterCount() const
-{
-    return m_parameters->size();
 }
 
@@ -123 +125 @@
     visitor.append(&thisObject->m_symbolTableForCall);
     visitor.append(&thisObject->m_symbolTableForConstruct);
+    visitor.append(&thisObject->m_parameterString);
 }
 
@@ -185 +188 @@
 }
 
+void UnlinkedFunctionExecutable::finishCreation(VM& vm, const SourceCode& source, FunctionBodyNode* node)
+{
+    Base::finishCreation(vm);
+    m_nameValue.set(vm, this, jsString(&vm, name().string()));
+    // We make an isolated copy of the parameter string as we don't want to keep the
+    // full source string alive.
+    String parameterString = source.provider()->getRange(node->parametersStartOffset(), node->parametersEndOffset()).isolatedCopy();
+    m_parameterString.set(vm, this, jsString(&vm, parameterString));
+}
+
 String UnlinkedFunctionExecutable::paramString() const
 {
-    FunctionParameters& parameters = *m_parameters;
-    StringBuilder builder;
-    for (size_t pos = 0; pos < parameters.size(); ++pos) {
-        if (!builder.isEmpty())
-            builder.appendLiteral(", ");
-        parameters.at(pos)->toString(builder);
-    }
-    return builder.toString();
+    return m_parameterString->tryGetValue();
+}
+
+RefPtr<FunctionParameters> UnlinkedFunctionExecutable::parameters(VM* vm)
+{
+    if (!m_parameterCount)
+        return FunctionParameters::create(nullptr);
+
+    SourceCode parameterSource = makeSource(m_parameterString->tryGetValue());
+    RefPtr<FunctionParameters> parameters = parseParameters(vm, parameterSource, toStrictness());
+    ASSERT(!parameters || parameters->size() == m_parameterCount);
+    return parameters;
 }