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

Timestamp:

Nov 8, 2007, 9:48:49 PM (18 years ago)

Author:

Darin Adler

Message:

Reviewed by Oliver.

• ​http://bugs.webkit.org/show_bug.cgi?id=15904 more speed-ups possible by tightening up int version of JSImmediate

1% improvement of SunSpider

• kjs/JSImmediate.h: Eliminate the now-unneeded FPBitValues struct template. (KJS::JSImmediate::from): Overload for most numeric types; many types can do fewer branches and checks. (KJS::JSImmediate::getUInt32): Removed unneeded check for undefined. (KJS::JSImmediate::getTruncatedInt32): Ditto. (KJS::JSImmediate::getTruncatedUInt32): Ditto. There's no difference any more between getUInt32 and getTruncatedUInt32, so that's worth a rename and merge later.

• kjs/grammar.y: Update since fromDouble is now just from.
• kjs/nodes.h: Ditto.

• kjs/value.h: (KJS::jsNumber): Overload for most numeric types.

File:

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

trunk/JavaScriptCore/kjs/nodes.h

@@ -1 @@
-// -*- c-basic-offset: 2 -*-
 /*
  *  Copyright (C) 1999-2000 Harri Porten ([email protected])
@@ -112 +111 @@
   };
 
-  class Node {
+  class Node : Noncopyable {
   public:
     Node() KJS_FAST_CALL;
@@ -136 +135 @@
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL { }
 
-    // Used to optimize those nodes that do extra work when returning a result, even if the result has no semantic relevance
-    virtual void optimizeForUnnecessaryResult() { }
-      
   protected:
     Completion createErrorCompletion(ExecState *, ErrorType, const char *msg) KJS_FAST_CALL;
@@ -160 +156 @@
     int m_line : 31;
     bool m_mayHaveDeclarations : 1;
-  private:
-    // disallow assignment
-    Node& operator=(const Node&) KJS_FAST_CALL;
-    Node(const Node &other) KJS_FAST_CALL;
   };
     
@@ -187 +179 @@
         virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL = 0;
         virtual double evaluateToNumber(ExecState*) KJS_FAST_CALL;
-    };
+
+        // Used to optimize those nodes that do extra work when returning a result, even if the result has no semantic relevance
+        virtual void optimizeForUnnecessaryResult() { }
+   };
 
   class StatementNode : public Node {
@@ -240 +235 @@
   class ImmediateNumberNode : public NumberNode {
   public:
-      ImmediateNumberNode(JSValue* v, double d) KJS_FAST_CALL : NumberNode(d), m_value(v) { ASSERT(v == JSImmediate::fromDouble(d)); }
+      ImmediateNumberNode(JSValue* v, double d) KJS_FAST_CALL : NumberNode(d), m_value(v) { ASSERT(v == JSImmediate::from(d)); }
       virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
       
-      virtual void setValue(double d) KJS_FAST_CALL { m_double = d; m_value = JSImmediate::fromDouble(d); ASSERT(m_value); }
+      virtual void setValue(double d) KJS_FAST_CALL { m_double = d; m_value = JSImmediate::from(d); ASSERT(m_value); }
   private:
       JSValue* m_value;
@@ -322 +317 @@
   };
 
-  class ElementNode : public ExpressionNode {
+  class ElementNode : public Node {
   public:
     ElementNode(int e, ExpressionNode* n) KJS_FAST_CALL : elision(e), node(n) { }
     ElementNode(ElementNode* l, int e, ExpressionNode* n) KJS_FAST_CALL
       : elision(e), node(n) { l->next = this; }
-    virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
-    virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
-    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
+    virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
+    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
+    virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
+
     PassRefPtr<ElementNode> releaseNext() KJS_FAST_CALL { return next.release(); }
-    virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
+
+    JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+
   private:
     friend class ArrayNode;
@@ -356 +354 @@
   };
 
-  class PropertyNode : public ExpressionNode {
+  class PropertyNode : public Node {
   public:
     enum Type { Constant, Getter, Setter };
@@ -362 +360 @@
       : m_name(n), assign(a), type(t) { }
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
-    virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
-    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
+    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
+    virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
+
+    JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    const Identifier& name() const { return m_name; }
+
+  private:
     friend class PropertyListNode;
-    virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
-    const Identifier& name() const { return m_name; }
-  private:
     Identifier m_name;
     RefPtr<ExpressionNode> assign;
@@ -373 +373 @@
   };
   
-  class PropertyListNode : public ExpressionNode {
+  class PropertyListNode : public Node {
   public:
     PropertyListNode(PropertyNode* n) KJS_FAST_CALL
@@ -380 +380 @@
       : node(n) { l->next = this; }
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
-    virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
-    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
+    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
+    virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
+
+    JSValue* evaluate(ExecState*) KJS_FAST_CALL;
     PassRefPtr<PropertyListNode> releaseNext() KJS_FAST_CALL { return next.release(); }
-    virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
+
   private:
     friend class ObjectLiteralNode;
@@ -440 +442 @@
   };
 
-  class ArgumentListNode : public ExpressionNode {
+  class ArgumentListNode : public Node {
   public:
     ArgumentListNode(ExpressionNode* e) KJS_FAST_CALL : expr(e) { }
@@ -446 +448 @@
       : expr(e) { l->next = this; }
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
-    virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
+    virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
+
     void evaluateList(ExecState*, List&) KJS_FAST_CALL;
-    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     PassRefPtr<ArgumentListNode> releaseNext() KJS_FAST_CALL { return next.release(); }
-    virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
+
   private:
     friend class ArgumentsNode;
@@ -457 +460 @@
   };
 
-  class ArgumentsNode : public ExpressionNode {
+  class ArgumentsNode : public Node {
   public:
     ArgumentsNode() KJS_FAST_CALL { }
@@ -463 +466 @@
       : listNode(l) { }
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
-    virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
+    virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
+
     void evaluateList(ExecState* exec, List& list) KJS_FAST_CALL { if (listNode) listNode->evaluateList(exec, list); }
-    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-    virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
+
   private:
     RefPtr<ArgumentListNode> listNode;
@@ -560 +564 @@
   };
 
-    class PrePostResolveNode : public ExpressionNode {
+  class PrePostResolveNode : public ExpressionNode {
   public:
     PrePostResolveNode(const Identifier& i) KJS_FAST_CALL : m_ident(i) {}
@@ -634 +638 @@
   };
 
-    class PostfixBracketNode : public ExpressionNode {
+  class PostfixBracketNode : public ExpressionNode {
   public:
     PostfixBracketNode(ExpressionNode* b, ExpressionNode* s) KJS_FAST_CALL : m_base(b), m_subscript(s) {}