Changeset 27025 in webkit for trunk/JavaScriptCore/kjs/nodes.h

Timestamp:

Oct 25, 2007, 12:09:44 AM (18 years ago)

Author:

ggaren

Message:

JavaScriptCore:

Reviewed by Maciej Stachowiak.

Fixed ​http://bugs.webkit.org/show_bug.cgi?id=15683
Re-order declaration initialization to avoid calling hasProperty inside
VarDeclNode::processDeclaration

.7% speedup on SunSpider.

• kjs/function.h:
• kjs/function.cpp: Merged parameter processing into FunctionBodyNode's other processing of declared symbols, so the order of execution could change.

• kjs/nodes.cpp: (KJS::VarDeclNode::getDeclarations): Added special case for the "arguments" property name, explained in the comment.

(KJS::VarDeclNode::processDeclaration): Removed call to hasProperty
in the case of function code, since we know the declared symbol
management will resolve conflicts between symbols. Yay!

(KJS::VarDeclListNode::getDeclarations): Now that VarDeclNode's
implementation of getDeclarations is non-trivial, we can't take a
short-cut here any longer -- we need to put the VarDecl node on the
stack so it gets processed normally.

(KJS::FunctionBodyNode::processDeclarations): Changed the order of
processing to enforce mutual exclusion rules.

• kjs/nodes.h: (KJS::DeclarationStacks::DeclarationStacks): Structure includes an ExecState now, for fast access to the "arguments" property name.

LayoutTests:

Layout tests for bugs that might result from changes like
​http://bugs.webkit.org/show_bug.cgi?id=15683

• fast/js/vardecl-preserve-parameters-expected.txt: Added.
• fast/js/vardecl-preserve-parameters.html: Added.
• fast/js/vardecl-preserve-vardecl-expected.txt: Added.
• fast/js/vardecl-preserve-vardecl.html: Added.

File:

• trunk/JavaScriptCore/kjs/nodes.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/nodes.h

@@ -89 +89 @@
       typedef Vector<FuncDeclNode*, 16> FunctionStack;
       
-      DeclarationStacks(NodeStack& n, VarStack& v, FunctionStack& f)
-        : nodeStack(n)
+      DeclarationStacks(ExecState* e, NodeStack& n, VarStack& v, FunctionStack& f)
+        : exec(e)
+        , nodeStack(n)
         , varStack(v)
         , functionStack(f)
       {
       }
-        
+
+      ExecState* exec;
       NodeStack& nodeStack;
       VarStack& varStack; 
@@ -1244 +1246 @@
     UString m_sourceURL;
     int m_sourceId;
-    Vector<Identifier> m_parameters;
-
-    void initializeDeclarationStacks();
+
+    void initializeDeclarationStacks(ExecState*);
     bool m_initializedDeclarationStacks;
+
     DeclarationStacks::VarStack m_varStack;
     DeclarationStacks::FunctionStack m_functionStack;
+    Vector<Identifier> m_parameters;
   };