Changeset 26582 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Oct 14, 2007, 4:31:58 AM (18 years ago)

Author:

bdash

Message:

2007-10-14 Cameron Zwarich <​[email protected]>

Reviewed by Darin.

Adds NegateNode optimization from KJS. The relevant revision in KDE
is 666736.

• kjs/grammar.y:
• kjs/nodes.cpp: (NumberNode::evaluate):
• kjs/nodes.h: (KJS::Node::): (KJS::NumberNode::):
• kjs/nodes2string.cpp: (NumberNode::streamTo):

2007-10-14 Cameron Zwarich <​[email protected]>

Reviewed by Darin.

Adds serialization test cases for NegateNode optimization from KDE.

• fast/js/function-decompilation-operators-expected.txt:
• fast/js/function-decompilation-operators.html:

Location:

trunk/JavaScriptCore/kjs

Files:

• grammar.y (modified) (3 diffs)
• nodes.cpp (modified) (1 diff)
• nodes.h (modified) (2 diffs)
• nodes2string.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/grammar.y

@@ -64 +64 @@
 static Node *makeTypeOfNode(Node *expr);
 static Node *makeDeleteNode(Node *expr);
+static Node *makeNegateNode(Node *expr);
 
 #if COMPILER(MSVC)
@@ -360 +361 @@
   | AUTOMINUSMINUS UnaryExpr            { $$ = makePrefixNode($2, OpMinusMinus); }
   | '+' UnaryExpr                       { $$ = new UnaryPlusNode($2); }
-  | '-' UnaryExpr                       { $$ = new NegateNode($2); }
+  | '-' UnaryExpr                       { $$ = makeNegateNode($2); }
   | '~' UnaryExpr                       { $$ = new BitwiseNotNode($2); }
   | '!' UnaryExpr                       { $$ = new LogicalNotNode($2); }
@@ -1004 +1005 @@
 }
 
+static Node* makeNegateNode(Node *n)
+{
+    if (n->isNumber()) {
+        NumberNode* number = static_cast<NumberNode*>(n);
+
+        if (number->value() > 0.0) {
+            number->setValue(-number->value());
+            return number;
+        }
+    }
+
+    return new NegateNode(n);
+}
+
 /* called by yyparse on error */
 int yyerror(const char *)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -350 +350 @@
 JSValue *NumberNode::evaluate(ExecState *)
 {
-  return jsNumber(value);
+  return jsNumber(val);
 }
 

trunk/JavaScriptCore/kjs/nodes.h

@@ -101 +101 @@
     virtual Node *nodeInsideAllParens() KJS_FAST_CALL;
 
+    virtual bool isNumber() const KJS_FAST_CALL { return false; }
     virtual bool isLocation() const KJS_FAST_CALL { return false; }
     virtual bool isResolveNode() const KJS_FAST_CALL { return false; }
@@ -168 +169 @@
   class NumberNode : public Node {
   public:
-    NumberNode(double v) KJS_FAST_CALL : value(v) {}
-    JSValue* evaluate(ExecState*) KJS_FAST_CALL;
-    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-  private:
-    double value;
+    NumberNode(double v) KJS_FAST_CALL : val(v) {}
+    JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
+
+    virtual bool isNumber() const KJS_FAST_CALL { return true; }
+    double value() const KJS_FAST_CALL { return val; }
+    void setValue(double v) KJS_FAST_CALL { val = v; }
+  private:
+    double val;
   };
 

trunk/JavaScriptCore/kjs/nodes2string.cpp

@@ -141 +141 @@
 }
 
-void NumberNode::streamTo(SourceStream &s) const { s << value; }
+void NumberNode::streamTo(SourceStream &s) const { s << val; }
 
 void StringNode::streamTo(SourceStream &s) const