Fix a regression in test/CodeGen/X86/2007-04-24-VectorCrash.ll introduced

by r43510. Gracefully handle constants with vector type that aren't
ConstantVector or ConstantAggregateZero.

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

diff --git a/lib/VMCore/ConstantFold.cpp b/lib/VMCore/ConstantFold.cpp
index 2f2c61812902faedbdb8492140401f07a4308bac..257e4813d1d1200b1249c843d75937c6289e04b4 100644 (file)
--- a/lib/VMCore/ConstantFold.cpp
+++ b/lib/VMCore/ConstantFold.cpp
@@ -716,10 +716,8 @@ Constant *llvm::ConstantFoldBinaryInstruction(unsigned Opcode,
   } else if (const VectorType *VTy = dyn_cast<VectorType>(C1->getType())) {
     const ConstantVector *CP1 = dyn_cast<ConstantVector>(C1);
     const ConstantVector *CP2 = dyn_cast<ConstantVector>(C2);
-    assert((CP1 != NULL || isa<ConstantAggregateZero>(C1)) &&
-           "Unexpected kind of vector constant!");
-    assert((CP2 != NULL || isa<ConstantAggregateZero>(C2)) &&
-           "Unexpected kind of vector constant!");
+    if ((CP1 != NULL || isa<ConstantAggregateZero>(C1)) &&
+        (CP2 != NULL || isa<ConstantAggregateZero>(C2))) {
       switch (Opcode) {
         default:
           break;
@@ -747,6 +745,7 @@ Constant *llvm::ConstantFoldBinaryInstruction(unsigned Opcode,
         return EvalVectorOp(CP1, CP2, VTy, ConstantExpr::getOr);
         case Instruction::Xor: 
         return EvalVectorOp(CP1, CP2, VTy, ConstantExpr::getXor);
+      }
     }
   }