diff options
| -rw-r--r-- | lib/VMCore/ConstantFold.cpp | 6 | ||||
| -rw-r--r-- | lib/VMCore/Constants.cpp | 2 | ||||
| -rw-r--r-- | test/Assembler/vector-shift.ll | 17 |
3 files changed, 21 insertions, 4 deletions
diff --git a/lib/VMCore/ConstantFold.cpp b/lib/VMCore/ConstantFold.cpp index f2847112af..7e4902fd56 100644 --- a/lib/VMCore/ConstantFold.cpp +++ b/lib/VMCore/ConstantFold.cpp @@ -832,6 +832,12 @@ Constant *llvm::ConstantFoldBinaryInstruction(unsigned Opcode, return EvalVectorOp(CP1, CP2, VTy, ConstantExpr::getOr); case Instruction::Xor: return EvalVectorOp(CP1, CP2, VTy, ConstantExpr::getXor); + case Instruction::LShr: + return EvalVectorOp(CP1, CP2, VTy, ConstantExpr::getLShr); + case Instruction::AShr: + return EvalVectorOp(CP1, CP2, VTy, ConstantExpr::getAShr); + case Instruction::Shl: + return EvalVectorOp(CP1, CP2, VTy, ConstantExpr::getShl); } } } diff --git a/lib/VMCore/Constants.cpp b/lib/VMCore/Constants.cpp index 0be2811e35..ed1e04ad54 100644 --- a/lib/VMCore/Constants.cpp +++ b/lib/VMCore/Constants.cpp @@ -2095,7 +2095,7 @@ Constant *ConstantExpr::get(unsigned Opcode, Constant *C1, Constant *C2) { case Instruction::LShr: case Instruction::AShr: assert(C1->getType() == C2->getType() && "Op types should be identical!"); - assert(C1->getType()->isInteger() && + assert(C1->getType()->isIntOrIntVector() && "Tried to create a shift operation on a non-integer type!"); break; default: diff --git a/test/Assembler/vector-shift.ll b/test/Assembler/vector-shift.ll index 3b2c07c903..1850e66e8e 100644 --- a/test/Assembler/vector-shift.ll +++ b/test/Assembler/vector-shift.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | grep shl -; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | grep ashr -; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | grep lshr +; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | grep shl | count 1 +; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | grep ashr | count 1 +; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | grep lshr | count 1 define <4 x i32> @foo(<4 x i32> %a, <4 x i32> %b) nounwind { entry: @@ -19,3 +19,14 @@ entry: %cmp = ashr <4 x i32> %a, %b ; <4 x i32> [#uses=1] ret <4 x i32> %cmp } + +; Constant expressions: these should be folded. +define <2 x i64> @foo_ce() nounwind { + ret <2 x i64> shl (<2 x i64> <i64 5, i64 6>, <2 x i64> <i64 3, i64 5>) +} +define <2 x i64> @bar_ce() nounwind { + ret <2 x i64> lshr (<2 x i64> <i64 340, i64 380>, <2 x i64> <i64 3, i64 5>) +} +define <2 x i64> @baz_ce() nounwind { + ret <2 x i64> ashr (<2 x i64> <i64 573, i64 411>, <2 x i64> <i64 3, i64 5>) +} |