Changeset 26811 in webkit

Timestamp:

Oct 20, 2007, 12:11:53 AM (18 years ago)

Author:

ggaren

Message:

Reviewed by Maciej Stachowiak.

Fixed ​http://bugs.webkit.org/show_bug.cgi?id=15570
Store gathered declaration nodes in the function body node.

This means that you only have to gather the declaration nodes the first
time the function executes. Performance gain of 2.10% on SunSpider,
0.90% on command-line JS iBench.

• kjs/nodes.cpp: Split declaration stack initialization code off into initializeDeclarationStacks(). (FunctionBodyNode::FunctionBodyNode): (FunctionBodyNode::initializeDeclarationStacks): (FunctionBodyNode::processDeclarations):

• kjs/nodes.h: Changed DeclarationStacks structure to hold references, since the actual Vectors are now stored either on the stack or in the function body node.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/nodes.cpp (modified) (3 diffs)
• kjs/nodes.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-10-20  Geoffrey Garen  <[email protected]>
+
+        Reviewed by Maciej Stachowiak.
+
+        Fixed http://bugs.webkit.org/show_bug.cgi?id=15570
+        Store gathered declaration nodes in the function body node.
+        
+        This means that you only have to gather the declaration nodes the first 
+        time the function executes. Performance gain of 2.10% on SunSpider, 
+        0.90% on command-line JS iBench.
+
+        * kjs/nodes.cpp: Split declaration stack initialization code off into 
+        initializeDeclarationStacks().
+        (FunctionBodyNode::FunctionBodyNode):
+        (FunctionBodyNode::initializeDeclarationStacks):
+        (FunctionBodyNode::processDeclarations):
+
+        * kjs/nodes.h: Changed DeclarationStacks structure to hold references, 
+        since the actual Vectors are now stored either on the stack or in the 
+        function body node.
+
 2007-10-19  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -2423 +2423 @@
     , m_sourceURL(Lexer::curr()->sourceURL())
     , m_sourceId(Parser::sid)
-{
-
+    , m_initializedDeclarationStacks(false)
+{
   setLoc(-1, -1);
 }
 
-void FunctionBodyNode::processDeclarations(ExecState* exec)
+void FunctionBodyNode::initializeDeclarationStacks()
 {
     Node* node = source.get();
@@ -2434 +2434 @@
         return;
 
-    DeclarationStacks stacks;
-    DeclarationStacks::NodeStack& nodeStack = stacks.nodeStack;
+    DeclarationStacks::NodeStack nodeStack;
+    DeclarationStacks stacks(nodeStack, m_varStack, m_functionStack);
     
     while (true) {
@@ -2448 +2448 @@
         nodeStack.shrink(size);
     }
-    
+
+    m_initializedDeclarationStacks = true;
+}
+
+void FunctionBodyNode::processDeclarations(ExecState* exec)
+{
+    if (!m_initializedDeclarationStacks)
+        initializeDeclarationStacks();
+
     size_t i, size;
 
-    DeclarationStacks::FunctionStack& functionStack = stacks.functionStack;
-    for (i = 0, size = functionStack.size(); i < size; ++i)
-        functionStack[i]->processDeclaration(exec);
-
-    DeclarationStacks::VarStack& varStack = stacks.varStack;
-    for (i = 0, size = varStack.size(); i < size; ++i)
-        varStack[i]->processDeclaration(exec);
+    for (i = 0, size = m_functionStack.size(); i < size; ++i)
+        m_functionStack[i]->processDeclaration(exec);
+
+    for (i = 0, size = m_varStack.size(); i < size; ++i)
+        m_varStack[i]->processDeclaration(exec);
 }
 

trunk/JavaScriptCore/kjs/nodes.h

@@ -90 +90 @@
       typedef Vector<FuncDeclNode*, 16> FunctionStack;
       
-      NodeStack nodeStack;
-      VarStack varStack; 
-      FunctionStack functionStack;
+      DeclarationStacks(NodeStack& n, VarStack& v, FunctionStack& f)
+        : nodeStack(n)
+        , varStack(v)
+        , functionStack(f)
+      {
+      }
+        
+      NodeStack& nodeStack;
+      VarStack& varStack; 
+      FunctionStack& functionStack;
   };
 
@@ -1057 +1064 @@
     int m_sourceId;
     Vector<Identifier> m_parameters;
+
+    void initializeDeclarationStacks();
+    bool m_initializedDeclarationStacks;
+    DeclarationStacks::VarStack m_varStack;
+    DeclarationStacks::FunctionStack m_functionStack;
   };