Changeset 34784 in webkit for trunk/JavaScriptCore

Timestamp:

Jun 24, 2008, 5:41:40 PM (17 years ago)

Author:

[email protected]

Message:

2008-06-24 Cameron Zwarich <​[email protected]>

Reviewed by Maciej.

Make the conversion of the pair (less, jtrue) to jless use register
reference counting information for safety instead of requiring callers
to decide whether it is safe.

No changes on SunSpider codegen.

• VM/CodeGenerator.cpp: (KJS::CodeGenerator::emitJumpIfTrue):
• VM/CodeGenerator.h:
• kjs/nodes.cpp: (KJS::DoWhileNode::emitCode): (KJS::WhileNode::emitCode): (KJS::ForNode::emitCode): (KJS::CaseBlockNode::emitCodeForBlock):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/CodeGenerator.cpp (modified) (3 diffs)
• VM/CodeGenerator.h (modified) (1 diff)
• kjs/nodes.cpp (modified) (5 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-06-24  Cameron Zwarich  <[email protected]>
+
+        Reviewed by Maciej.
+
+        Make the conversion of the pair (less, jtrue) to jless use register
+        reference counting information for safety instead of requiring callers
+        to decide whether it is safe.
+
+        No changes on SunSpider codegen.
+
+        * VM/CodeGenerator.cpp:
+        (KJS::CodeGenerator::emitJumpIfTrue):
+        * VM/CodeGenerator.h:
+        * kjs/nodes.cpp:
+        (KJS::DoWhileNode::emitCode):
+        (KJS::WhileNode::emitCode):
+        (KJS::ForNode::emitCode):
+        (KJS::CaseBlockNode::emitCodeForBlock):
+
 2008-06-24  Kevin McCullough  <[email protected]>
 

trunk/JavaScriptCore/VM/CodeGenerator.cpp

@@ -426 +426 @@
 }
 
-PassRefPtr<LabelID> CodeGenerator::emitJumpIfTrueMayCombine(RegisterID* cond, LabelID* target)
+PassRefPtr<LabelID> CodeGenerator::emitJumpIfTrue(RegisterID* cond, LabelID* target)
 {
     if (m_lastOpcodeID == op_less) {
@@ -435 +435 @@
         retrieveLastBinaryOp(dstIndex, src1Index, src2Index);
         
-        if (cond->index() == dstIndex) {
+        if (cond->index() == dstIndex && !cond->refCount()) {
             rewindBinaryOp();
             emitOpcode(op_jless);
@@ -445 +445 @@
     }
     
-    return emitJumpIfTrue(cond, target);
-}
-
-PassRefPtr<LabelID> CodeGenerator::emitJumpIfTrue(RegisterID* cond, LabelID* target)
-{
     emitOpcode(op_jtrue);
     instructions().append(cond->index());

trunk/JavaScriptCore/VM/CodeGenerator.h

@@ -246 +246 @@
         PassRefPtr<LabelID> emitLabel(LabelID*);
         PassRefPtr<LabelID> emitJump(LabelID* target);
-        PassRefPtr<LabelID> emitJumpIfTrueMayCombine(RegisterID* cond, LabelID* target);
         PassRefPtr<LabelID> emitJumpIfTrue(RegisterID* cond, LabelID* target);
         PassRefPtr<LabelID> emitJumpIfFalse(RegisterID* cond, LabelID* target);

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1201 +1201 @@
     generator.emitLabel(continueTarget.get());
     RegisterID* cond = generator.emitNode(m_expr.get());
-    generator.emitJumpIfTrueMayCombine(cond, topOfLoop.get());
+    generator.emitJumpIfTrue(cond, topOfLoop.get());
     generator.emitLabel(breakTarget.get());
     return result.get();
@@ -1223 +1223 @@
     generator.emitLabel(continueTarget.get());
     RegisterID* cond = generator.emitNode(m_expr.get());
-    generator.emitJumpIfTrueMayCombine(cond, topOfLoop.get());
+    generator.emitJumpIfTrue(cond, topOfLoop.get());
 
     generator.emitLabel(breakTarget.get());
@@ -1255 +1255 @@
     if (m_expr2) {
         RegisterID* cond = generator.emitNode(m_expr2.get());
-        generator.emitJumpIfTrueMayCombine(cond, topOfLoop.get());
+        generator.emitJumpIfTrue(cond, topOfLoop.get());
     } else {
         generator.emitJump(topOfLoop.get());
@@ -1423 +1423 @@
         generator.emitBinaryOp(op_stricteq, clauseVal, clauseVal, switchExpression);
         labelVector.append(generator.newLabel());
-        generator.emitJumpIfTrueMayCombine(clauseVal, labelVector[labelVector.size() - 1].get());
+        generator.emitJumpIfTrue(clauseVal, labelVector[labelVector.size() - 1].get());
     }
 
@@ -1430 +1430 @@
         generator.emitBinaryOp(op_stricteq, clauseVal, clauseVal, switchExpression);
         labelVector.append(generator.newLabel());
-        generator.emitJumpIfTrueMayCombine(clauseVal, labelVector[labelVector.size() - 1].get());
+        generator.emitJumpIfTrue(clauseVal, labelVector[labelVector.size() - 1].get());
     }