[llvm-commits] CVS: llvm/lib/Transforms/Scalar/InstructionCombining.cpp

[Chris Lattner]

Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.171 -> 1.172

---
Log message:

Add some debugging output
Fix InstCombine/2004-03-13-InstCombineInfLoop.ll which caused an infinite
loop compiling (I think) povray.



---
Diffs of the changes:  (+8 -1)

Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.171 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.172
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.171	Fri Mar 12 18:11:49 2004
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Sat Mar 13 17:54:27 2004
@@ -33,6 +33,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#define DEBUG_TYPE "instcombine"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Instructions.h"
 #include "llvm/Intrinsics.h"
@@ -46,6 +47,7 @@
 #include "llvm/Support/InstIterator.h"
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Support/CallSite.h"
+#include "Support/Debug.h"
 #include "Support/Statistic.h"
 #include <algorithm>
 using namespace llvm;
@@ -1551,7 +1553,7 @@
   if (CastInst *CI = dyn_cast<CastInst>(Op0)) {
     Value *CastOp0 = CI->getOperand(0);
     if (CastOp0->getType()->isLosslesslyConvertibleTo(CI->getType()) &&
-        !isa<Argument>(Op1) &&
+        (isa<Constant>(Op1) || isa<CastInst>(Op1)) &&
         (I.getOpcode() == Instruction::SetEQ ||
          I.getOpcode() == Instruction::SetNE)) {
       // We keep moving the cast from the left operand over to the right
@@ -2543,6 +2545,9 @@
       ++NumCombined;
       // Should we replace the old instruction with a new one?
       if (Result != I) {
+        DEBUG(std::cerr << "IC: Old = " << *I
+                        << "    New = " << *Result);
+
         // Instructions can end up on the worklist more than once.  Make sure
         // we do not process an instruction that has been deleted.
         removeFromWorkList(I);
@@ -2561,6 +2566,8 @@
         // Erase the old instruction.
         InstParent->getInstList().erase(I);
       } else {
+        DEBUG(std::cerr << "IC: MOD = " << *I);
+
         BasicBlock::iterator II = I;
 
         // If the instruction was modified, it's possible that it is now dead.