Changeset 35221 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

Jul 17, 2008, 5:06:13 AM (17 years ago)

Author:

[email protected]

Message:

2008-07-17 Gavin Barraclough <​[email protected]>

Reviewed by Cameron Zwarich.

Merge logical nodes to simplify the parse tree.
Sunspider results show 0.6% progression (no performance change expected).

• kjs/grammar.y:
• kjs/nodes.cpp:
• kjs/nodes.h:
• kjs/nodes2string.cpp:

File:

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

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -809 +809 @@
 // ------------------------------ Binary Logical Nodes ----------------------------
 
-RegisterID* LogicalAndNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* LogicalOpNode::emitCode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> temp = generator.tempDestination(dst);
@@ -815 +815 @@
     
     generator.emitNode(temp.get(), m_expr1.get());
-    generator.emitJumpIfFalse(temp.get(), target.get());
-    generator.emitNode(temp.get(), m_expr2.get());
-    generator.emitLabel(target.get());
-
-    return generator.moveToDestinationIfNeeded(dst, temp.get());
-}
-
-RegisterID* LogicalOrNode::emitCode(CodeGenerator& generator, RegisterID* dst)
-{
-    RefPtr<RegisterID> temp = generator.tempDestination(dst);
-    RefPtr<LabelID> target = generator.newLabel();
-    
-    generator.emitNode(temp.get(), m_expr1.get());
-    generator.emitJumpIfTrue(temp.get(), target.get());
+    if (m_operator == OpLogicalAnd)
+        generator.emitJumpIfFalse(temp.get(), target.get());
+    else
+        generator.emitJumpIfTrue(temp.get(), target.get());
     generator.emitNode(temp.get(), m_expr2.get());
     generator.emitLabel(target.get());