Changeset 34781 in webkit for trunk/JavaScriptCore/VM/CodeGenerator.cpp

Timestamp:

Jun 24, 2008, 4:03:11 PM (17 years ago)

Author:

[email protected]

Message:

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

Rubber stamped by Oliver.

Roll out r34777 due to multiple assertion failures on tests.

• ChangeLog:
• VM/CodeGenerator.cpp: (KJS::CodeGenerator::emitJump): (KJS::CodeGenerator::emitJumpIfTrueMayCombine): (KJS::CodeGenerator::emitJumpIfTrue): (KJS::CodeGenerator::emitJumpIfFalse): (KJS::CodeGenerator::emitJumpScopes):
• VM/LabelID.h:
• VM/Machine.cpp: (KJS::Machine::privateExecute):
• VM/Machine.h:
• VM/Opcode.h:

File:

• trunk/JavaScriptCore/VM/CodeGenerator.cpp (modified) (5 diffs)

trunk/JavaScriptCore/VM/CodeGenerator.cpp

@@ -421 +421 @@
 PassRefPtr<LabelID> CodeGenerator::emitJump(LabelID* target)
 {
-    ASSERT(target->isForwardLabel());
     emitOpcode(op_jmp);
     instructions().append(target->offsetFrom(instructions().size()));
@@ -438 +437 @@
         if (cond->index() == dstIndex) {
             rewindBinaryOp();
-            emitOpcode(target->isForwardLabel() ? op_jless : op_loop_if_less);
+            emitOpcode(op_jless);
             instructions().append(src1Index);
             instructions().append(src2Index);
@@ -451 +450 @@
 PassRefPtr<LabelID> CodeGenerator::emitJumpIfTrue(RegisterID* cond, LabelID* target)
 {
-    emitOpcode(target->isForwardLabel() ? op_jtrue : op_loop_if_true);
+    emitOpcode(op_jtrue);
     instructions().append(cond->index());
     instructions().append(target->offsetFrom(instructions().size()));
@@ -459 +458 @@
 PassRefPtr<LabelID> CodeGenerator::emitJumpIfFalse(RegisterID* cond, LabelID* target)
 {
-    ASSERT(target->isForwardLabel());
     emitOpcode(op_jfalse);
     instructions().append(cond->index());
@@ -1034 +1032 @@
 {
     ASSERT(scopeDepth() - targetScopeDepth >= 0);
-    ASSERT(target->isForwardLabel());
 
     size_t scopeDelta = scopeDepth() - targetScopeDepth;