Changeset 167964 in webkit for trunk/Source/JavaScriptCore/parser/Nodes.h

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/Nodes.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/parser/Nodes.h

@@ -1536 +1536 @@
         FunctionParameters* parameters() const { return m_parameters.get(); }
         size_t parameterCount() const { return m_parameters->size(); }
+        int parametersStartOffset() const { return m_parametersStart.endOffset; }
+        int parametersEndOffset() const { return m_parametersEnd.startOffset; }
 
         virtual void emitBytecode(BytecodeGenerator&, RegisterID* = 0) override;
@@ -1558 +1560 @@
         static const bool scopeIsFunction = true;
 
+        void setParameterLocation(const JSTokenLocation& openParen, const JSTokenLocation& closeParen)
+        {
+            m_parametersStart = openParen;
+            m_parametersEnd = closeParen;
+        }
     private:
         FunctionBodyNode(VM*, const JSTokenLocation& start, const JSTokenLocation& end, unsigned startColumn, unsigned endColumn, bool inStrictContext);
@@ -1566 +1573 @@
         FunctionMode m_functionMode;
         RefPtr<FunctionParameters> m_parameters;
+        JSTokenLocation m_parametersStart;
+        JSTokenLocation m_parametersEnd;
         int m_functionNameStart;
         unsigned m_startColumn;