Fix an infinite loop compiling oggenc last night.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28128 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp
index 2c8f6eda4955a2582e9ff7b05da2bec90eff7475..6491ff9b0f7fdd3f648bd19977dfd3477e475533 100644 (file)
--- a/lib/Transforms/Scalar/InstructionCombining.cpp
+++ b/lib/Transforms/Scalar/InstructionCombining.cpp
@@ -2642,9 +2642,10 @@ Instruction *InstCombiner::visitAnd(BinaryOperator &I) {
 
   // fold (and (cast A), (cast B)) -> (cast (and A, B))
   if (CastInst *Op0C = dyn_cast<CastInst>(Op0)) {
+    const Type *SrcTy = Op0C->getOperand(0)->getType();
     if (CastInst *Op1C = dyn_cast<CastInst>(Op1))
-      if (Op0C->getOperand(0)->getType() == Op1C->getOperand(0)->getType() &&
-          Op0C->getOperand(0)->getType()->isIntegral()) {
+      if (SrcTy == Op1C->getOperand(0)->getType() && SrcTy->isIntegral() &&
+          !SrcTy->isLosslesslyConvertibleTo(Op0C->getType())) {
         Instruction *NewOp = BinaryOperator::createAnd(Op0C->getOperand(0),
                                                        Op1C->getOperand(0),
                                                        I.getName());
@@ -2881,9 +2882,10 @@ Instruction *InstCombiner::visitOr(BinaryOperator &I) {
     
   // fold (or (cast A), (cast B)) -> (cast (or A, B))
   if (CastInst *Op0C = dyn_cast<CastInst>(Op0)) {
+    const Type *SrcTy = Op0C->getOperand(0)->getType();
     if (CastInst *Op1C = dyn_cast<CastInst>(Op1))
-      if (Op0C->getOperand(0)->getType() == Op1C->getOperand(0)->getType() &&
-          Op0C->getOperand(0)->getType()->isIntegral()) {
+      if (SrcTy == Op1C->getOperand(0)->getType() && SrcTy->isIntegral() &&
+          !SrcTy->isLosslesslyConvertibleTo(Op0C->getType())) {
         Instruction *NewOp = BinaryOperator::createOr(Op0C->getOperand(0),
                                                       Op1C->getOperand(0),
                                                       I.getName());
@@ -3059,9 +3061,10 @@ Instruction *InstCombiner::visitXor(BinaryOperator &I) {
 
   // fold (xor (cast A), (cast B)) -> (cast (xor A, B))
   if (CastInst *Op0C = dyn_cast<CastInst>(Op0)) {
+    const Type *SrcTy = Op0C->getOperand(0)->getType();
     if (CastInst *Op1C = dyn_cast<CastInst>(Op1))
-      if (Op0C->getOperand(0)->getType() == Op1C->getOperand(0)->getType() &&
-          Op0C->getOperand(0)->getType()->isIntegral()) {
+      if (SrcTy == Op1C->getOperand(0)->getType() && SrcTy->isIntegral() &&
+          !SrcTy->isLosslesslyConvertibleTo(Op0C->getType())) {
         Instruction *NewOp = BinaryOperator::createXor(Op0C->getOperand(0),
                                                        Op1C->getOperand(0),
                                                        I.getName());