From 7bc78f692c15916727e3ef2b74af1d38306c9d7e Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Tue, 23 Aug 2011 20:11:10 +0000 Subject: Revert "Address Duncan's CR request:" This reverts commit 20a05be15ea5271ab6185b83200fa88263362400. (svn rev 138340) Conflicts: test/Transforms/InstCombine/bitcast.ll llvm-svn: 138366 --- llvm/lib/Analysis/ConstantFolding.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'llvm/lib/Analysis/ConstantFolding.cpp') diff --git a/llvm/lib/Analysis/ConstantFolding.cpp b/llvm/lib/Analysis/ConstantFolding.cpp index 0eacaf80378..7a8c703040c 100644 --- a/llvm/lib/Analysis/ConstantFolding.cpp +++ b/llvm/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(C); + IntegerType *IntVTy = dyn_cast(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(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(C); if (CV == 0) return ConstantExpr::getBitCast(C, DestTy); -- cgit v1.2.3