1 files changed, 9 insertions, 4 deletions
diff --git a/lib/Analysis/ConstantFolding.cpp b/lib/Analysis/ConstantFolding.cpp
index 0eacaf8037..7a8c703040 100644
--- a/lib/Analysis/ConstantFolding.cpp
+++ b/lib/Analysis/ConstantFolding.cpp
@@ -45,9 +45,15 @@ using namespace llvm;
 /// ConstantExpr if unfoldable.
 static Constant *FoldBitCast(Constant *C, Type *DestTy,
                              const TargetData &TD) {
-  // Catch the obvious splat cases.
-  if (C->isNullValue()) return Constant::getNullValue(DestTy);
-  if (C->isAllOnesValue()) return Constant::getAllOnesValue(DestTy);
+  
+  ConstantVector *CV = dyn_cast<ConstantVector>(C);
+  IntegerType *IntVTy = dyn_cast<IntegerType>(DestTy);
+  // When casting vectors to scalar integers, catch the
+  // obvious splat cases.
+  if (IntVTy && CV) {
+    if (CV->isNullValue()) return ConstantInt::getNullValue(IntVTy);
+    if (CV->isAllOnesValue()) return ConstantInt::getAllOnesValue(IntVTy);
+  }
   
   // The code below only handles casts to vectors currently.
   VectorType *DestVTy = dyn_cast<VectorType>(DestTy);
@@ -62,7 +68,6 @@ static Constant *FoldBitCast(Constant *C, Type *DestTy,
   }
   
   // If this is a bitcast from constant vector -> vector, fold it.
-  ConstantVector *CV = dyn_cast<ConstantVector>(C);
   if (CV == 0)
     return ConstantExpr::getBitCast(C, DestTy);