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

[Jeff Cohen]

Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.644 -> 1.645
PredicateSimplifier.cpp updated: 1.54 -> 1.55
---
Log message:

Unbreak VC++ build.

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

 InstructionCombining.cpp |    1 +
 PredicateSimplifier.cpp  |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.644 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.645
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.644	Sun Mar  4 17:16:36 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Sun Mar  4 18:00:42 2007
@@ -7663,6 +7663,7 @@
                            PhiVal, ConstantOp);
   else
     assert(0 && "Unknown operation");
+  return 0;
 }
 
 /// DeadPHICycle - Return true if this PHI node is only used by a PHI node cycle


Index: llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp
diff -u llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp:1.54 llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp:1.55
--- llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp:1.54	Fri Mar  2 21:14:40 2007
+++ llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp	Sun Mar  4 18:00:42 2007
@@ -421,7 +421,7 @@
           iSGT = iUGT;
           iSLT = iULT;
         } else {
-          assert(iULT->first->getValue().isPositive() >= 0 &&
+          assert(iULT->first->getValue().isPositive() &&
                  iUGT->first->getValue().isNegative() &&"Bad sign comparison.");
           iSGT = iULT;
           iSLT = iUGT;