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

Timestamp:

Oct 28, 2007, 10:32:23 PM (18 years ago)

Author:

ggaren

Message:

Reviewed by Darin Adler.

Added FunctionCallResolveNode, PostfixResolveNode, and DeleteResolveNode
to the AST transfom that replaces slow resolve nodes with fast local
variable alternatives.

2.5% speedup on SunSpider.

Also added some missing copyright notices.

• kjs/nodes.cpp: (KJS::FunctionCallResolveNode::optimizeVariableAccess): (KJS::FunctionCallResolveNode::evaluate): (KJS::LocalVarFunctionCallNode::evaluate): (KJS::PostfixResolveNode::optimizeVariableAccess): (KJS::PostfixResolveNode::evaluate): (KJS::LocalVarPostfixNode::evaluate): (KJS::DeleteResolveNode::optimizeVariableAccess): (KJS::DeleteResolveNode::evaluate): (KJS::LocalVarDeleteNode::evaluate):
• kjs/nodes.h: (KJS::FunctionCallResolveNode::): (KJS::LocalVarFunctionCallNode::LocalVarFunctionCallNode): (KJS::PostfixResolveNode::): (KJS::LocalVarPostfixNode::LocalVarPostfixNode): (KJS::DeleteResolveNode::): (KJS::LocalVarDeleteNode::LocalVarDeleteNode):

File:

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

trunk/JavaScriptCore/kjs/nodes.h

@@ -4 +4 @@
  *  Copyright (C) 2001 Peter Kelly ([email protected])
  *  Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
+ *  Copyright (C) 2007 Cameron Zwarich ([email protected])
+ *  Copyright (C) 2007 Maks Orlovich
  *
  *  This library is free software; you can redistribute it and/or
@@ -294 +296 @@
   public:
     // Overwrites a ResolveNode in place.
-    LocalVarAccessNode(size_t i)
+    LocalVarAccessNode(size_t i) KJS_FAST_CALL
         : ResolveNode(PlacementNewAdopt)
     {
@@ -483 +485 @@
   class FunctionCallResolveNode : public Node {
   public:
-    FunctionCallResolveNode(const Identifier& i, ArgumentsNode *a) KJS_FAST_CALL : ident(i), args(a) {}
+    FunctionCallResolveNode(const Identifier& i, ArgumentsNode* a) KJS_FAST_CALL
+        : ident(i)
+        , args(a)
+    {
+    }
+
+    FunctionCallResolveNode(PlacementNewAdoptType) KJS_FAST_CALL 
+        : Node(PlacementNewAdopt)
+        , ident(PlacementNewAdopt)
+        , args(PlacementNewAdopt)
+    {
+    }
+
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     JSValue* evaluate(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual Precedence precedence() const { return PrecCall; }
-  private:
+
+  protected:
     Identifier ident;
     RefPtr<ArgumentsNode> args;
+    size_t index; // Used by LocalVarFunctionCallNode.
+  };
+
+  class LocalVarFunctionCallNode : public FunctionCallResolveNode {
+  public:
+    LocalVarFunctionCallNode(size_t i) KJS_FAST_CALL
+        : FunctionCallResolveNode(PlacementNewAdopt)
+    {
+        ASSERT(i != missingSymbolMarker());
+        index = i;
+    }
+
+    JSValue* evaluate(ExecState*) KJS_FAST_CALL;
   };
 
@@ -522 +550 @@
   public:
     PostfixResolveNode(const Identifier& i, Operator o) KJS_FAST_CALL : m_ident(i), m_oper(o) {}
+
+    PostfixResolveNode(PlacementNewAdoptType) KJS_FAST_CALL 
+        : Node(PlacementNewAdopt)
+        , m_ident(PlacementNewAdopt)
+    {
+    }
+
+    virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     JSValue* evaluate(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual Precedence precedence() const { return PrecPostfix; }
-  private:
+
+  protected:
     Identifier m_ident;
     Operator m_oper;
+    size_t index; // Used by LocalVarPostfixNode.
+  };
+
+  class LocalVarPostfixNode : public PostfixResolveNode {
+  public:
+    LocalVarPostfixNode(size_t i) KJS_FAST_CALL
+        : PostfixResolveNode(PlacementNewAdopt)
+    {
+        ASSERT(i != missingSymbolMarker());
+        index = i;
+    }
+
+    JSValue* evaluate(ExecState*) KJS_FAST_CALL;
   };
 
@@ -570 +620 @@
   public:
     DeleteResolveNode(const Identifier& i) KJS_FAST_CALL : m_ident(i) {}
+    DeleteResolveNode(PlacementNewAdoptType) KJS_FAST_CALL 
+        : Node(PlacementNewAdopt)
+        , m_ident(PlacementNewAdopt)
+    {
+    }
+
+    virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     JSValue* evaluate(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
@@ -575 +632 @@
   private:
     Identifier m_ident;
+  };
+
+  class LocalVarDeleteNode : public DeleteResolveNode {
+  public:
+    LocalVarDeleteNode() KJS_FAST_CALL
+        : DeleteResolveNode(PlacementNewAdopt)
+    {
+    }
+
+    JSValue* evaluate(ExecState*) KJS_FAST_CALL;
   };