Revert "Address Duncan's CR request:"
This reverts commit 20a05be15ea5271ab6185b83200fa88263362400. (svn rev 138340)
Conflicts:
test/Transforms/InstCombine/bitcast.ll
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@138366 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/ConstantFolding.cpp b/lib/Analysis/ConstantFolding.cpp
index 0eacaf8..7a8c703 100644
--- a/lib/Analysis/ConstantFolding.cpp
+++ b/lib/Analysis/ConstantFolding.cpp
@@ -45,9 +45,15 @@
/// 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 @@
}
// 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);