Changeset 110039 in webkit for trunk/Source/JavaScriptCore/parser/Nodes.cpp

Timestamp:

Mar 7, 2012, 2:18:43 AM (13 years ago)

Author:

[email protected]

Message:

Parser: Inline ScopeNodeData into ScopeNode
​https://bugs.webkit.org/show_bug.cgi?id=79776

Reviewed by Geoffrey Garen.

It used to be that some ScopeNode members were kept in a separate
structure because sometimes they wouldn't be needed, and
allocating a ParserArena was expensive. This patch makes
ParserArena lazily allocate its IdentifierArena, allowing the
members to be included directly, which is simpler and easier to
reason about.

• parser/ParserArena.cpp:

(JSC::ParserArena::ParserArena):
(JSC::ParserArena::reset):
(JSC::ParserArena::isEmpty):

• parser/ParserArena.h:

(JSC::ParserArena::identifierArena): Lazily allocate the
IdentifierArena.

• parser/Nodes.cpp:

(JSC::ScopeNode::ScopeNode):
(JSC::ScopeNode::singleStatement):
(JSC::ProgramNode::create):
(JSC::EvalNode::create):
(JSC::FunctionBodyNode::create):

• parser/Nodes.h:

(JSC::ScopeNode::destroyData):
(JSC::ScopeNode::needsActivationForMoreThanVariables):
(JSC::ScopeNode::needsActivation):
(JSC::ScopeNode::hasCapturedVariables):
(JSC::ScopeNode::capturedVariableCount):
(JSC::ScopeNode::captures):
(JSC::ScopeNode::varStack):
(JSC::ScopeNode::functionStack):
(JSC::ScopeNode::neededConstants):
(ScopeNode):

• bytecompiler/NodesCodegen.cpp:

(JSC::ScopeNode::emitStatementsBytecode): Inline ScopeNodeData
into ScopeNode. Adapt accessors.

File:

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

trunk/Source/JavaScriptCore/parser/Nodes.cpp

@@ -74 +74 @@
 }
 
-// -----------------------------ScopeNodeData ---------------------------
+// ------------------------------ ScopeNode -----------------------------
 
-ScopeNodeData::ScopeNodeData(ParserArena& arena, SourceElements* statements, VarStack* varStack, FunctionStack* funcStack, IdentifierSet& capturedVariables, int numConstants)
-    : m_numConstants(numConstants)
-    , m_statements(statements)
+ScopeNode::ScopeNode(JSGlobalData* globalData, int lineNumber, bool inStrictContext)
+    : StatementNode(lineNumber)
+    , ParserArenaRefCounted(globalData)
+    , m_features(inStrictContext ? StrictModeFeature : NoFeatures)
+    , m_numConstants(0)
+    , m_statements(0)
 {
-    m_arena.swap(arena);
+}
+
+ScopeNode::ScopeNode(JSGlobalData* globalData, int lineNumber, const SourceCode& source, SourceElements* children, VarStack* varStack, FunctionStack* funcStack, IdentifierSet& capturedVariables, CodeFeatures features, int numConstants)
+    : StatementNode(lineNumber)
+    , ParserArenaRefCounted(globalData)
+    , m_features(features)
+    , m_source(source)
+    , m_numConstants(numConstants)
+    , m_statements(children)
+{
+    m_arena.swap(*globalData->parserArena);
     if (varStack)
         m_varStack.swap(*varStack);
@@ -88 +101 @@
 }
 
-// ------------------------------ ScopeNode -----------------------------
-
-ScopeNode::ScopeNode(JSGlobalData* globalData, int lineNumber, bool inStrictContext)
-    : StatementNode(lineNumber)
-    , ParserArenaRefCounted(globalData)
-    , m_features(inStrictContext ? StrictModeFeature : NoFeatures)
-{
-}
-
-ScopeNode::ScopeNode(JSGlobalData* globalData, int lineNumber, const SourceCode& source, SourceElements* children, VarStack* varStack, FunctionStack* funcStack, IdentifierSet& capturedVariables, CodeFeatures features, int numConstants)
-    : StatementNode(lineNumber)
-    , ParserArenaRefCounted(globalData)
-    , m_data(adoptPtr(new ScopeNodeData(*globalData->parserArena, children, varStack, funcStack, capturedVariables, numConstants)))
-    , m_features(features)
-    , m_source(source)
-{
-}
-
 StatementNode* ScopeNode::singleStatement() const
 {
-    return m_data->m_statements ? m_data->m_statements->singleStatement() : 0;
+    return m_statements ? m_statements->singleStatement() : 0;
 }
 
@@ -122 +117 @@
     RefPtr<ProgramNode> node = new ProgramNode(globalData, lineNumber, children, varStack, funcStack,  capturedVariables, source, features, numConstants);
 
-    ASSERT(node->data()->m_arena.last() == node);
-    node->data()->m_arena.removeLast();
-    ASSERT(!node->data()->m_arena.contains(node.get()));
+    ASSERT(node->m_arena.last() == node);
+    node->m_arena.removeLast();
+    ASSERT(!node->m_arena.contains(node.get()));
 
     return node.release();
@@ -140 +135 @@
     RefPtr<EvalNode> node = new EvalNode(globalData, lineNumber, children, varStack, funcStack, capturedVariables, source, features, numConstants);
 
-    ASSERT(node->data()->m_arena.last() == node);
-    node->data()->m_arena.removeLast();
-    ASSERT(!node->data()->m_arena.contains(node.get()));
+    ASSERT(node->m_arena.last() == node);
+    node->m_arena.removeLast();
+    ASSERT(!node->m_arena.contains(node.get()));
 
     return node.release();
@@ -187 +182 @@
     RefPtr<FunctionBodyNode> node = new FunctionBodyNode(globalData, lineNumber, children, varStack, funcStack, capturedVariables, sourceCode, features, numConstants);
 
-    ASSERT(node->data()->m_arena.last() == node);
-    node->data()->m_arena.removeLast();
-    ASSERT(!node->data()->m_arena.contains(node.get()));
+    ASSERT(node->m_arena.last() == node);
+    node->m_arena.removeLast();
+    ASSERT(!node->m_arena.contains(node.get()));
 
     return node.release();