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

Timestamp:

Nov 3, 2007, 3:09:45 AM (18 years ago)

Author:

mjs

Message:

Reviewed by Oliver.

• remove VarDeclListNode and simplify VarDeclNode evaluation for 0.4% SunSpider speedup

• kjs/grammar.y:
• kjs/nodes.cpp: (KJS::VarDeclNode::optimizeVariableAccess): (KJS::VarDeclNode::getDeclarations): (KJS::VarDeclNode::handleSlowCase): (KJS::VarDeclNode::evaluateSingle): (KJS::VarDeclNode::evaluate): (KJS::VarStatementNode::execute):
• kjs/nodes.h: (KJS::VarDeclNode::): (KJS::VarStatementNode::):
• kjs/nodes2string.cpp: (KJS::VarDeclNode::streamTo):

File:

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

trunk/JavaScriptCore/kjs/nodes.h

@@ -1465 +1465 @@
     VarDeclNode(const Identifier &id, AssignExprNode *in, Type t) KJS_FAST_CALL;
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
-    JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual KJS::JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    void evaluateSingle(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
     virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
+    PassRefPtr<VarDeclNode> releaseNext() KJS_FAST_CALL { return next.release(); }
+
     Type varType;
     Identifier ident;
-  private:
-    JSValue* handleSlowCase(ExecState*, const ScopeChain&, JSValue*) KJS_FAST_CALL KJS_NO_INLINE;
+    ListRefPtr<VarDeclNode> next;
+  private:
+    void handleSlowCase(ExecState*, const ScopeChain&, JSValue*) KJS_FAST_CALL KJS_NO_INLINE;
     RefPtr<AssignExprNode> init;
   };
 
-  class VarDeclListNode : public Node {
-  public:
-    VarDeclListNode(VarDeclNode* v) KJS_FAST_CALL : var(v) { m_mayHaveDeclarations = true; }
-    VarDeclListNode(VarDeclListNode* l, VarDeclNode* v) KJS_FAST_CALL
-      : var(v) { l->next = this; m_mayHaveDeclarations = true; }
-    virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
-    JSValue* evaluate(ExecState*) KJS_FAST_CALL;
-    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-    PassRefPtr<VarDeclListNode> releaseNext() KJS_FAST_CALL { return next.release(); }
+  class VarStatementNode : public StatementNode {
+  public:
+    VarStatementNode(VarDeclNode* l) KJS_FAST_CALL : next(l) { m_mayHaveDeclarations = true; }
+    virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
+    virtual Completion execute(ExecState*) KJS_FAST_CALL;
+    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
-    virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
-  private:
-    friend class ForNode;
-    friend class VarStatementNode;
-    ListRefPtr<VarDeclListNode> next;
-    RefPtr<VarDeclNode> var;
-  };
-
-  class VarStatementNode : public StatementNode {
-  public:
-    VarStatementNode(VarDeclListNode* l) KJS_FAST_CALL : next(l) { m_mayHaveDeclarations = true; }
-    virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
-    virtual Completion execute(ExecState*) KJS_FAST_CALL;
-    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-    virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
-  private:
-    RefPtr<VarDeclListNode> next;
+  private:
+    RefPtr<VarDeclNode> next;
   };
 
@@ -1859 +1845 @@
 
   struct VarDeclList {
-      VarDeclListNode* head;
-      VarDeclListNode* tail;
+      VarDeclNode* head;
+      VarDeclNode* tail;
   };