summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2009-01-16 20:17:02 +0000
committerChris Lattner <sabre@nondot.org>2009-01-16 20:17:02 +0000
commit762edbc0748814eb88b1a66b0b54d106cbb02b65 (patch)
tree4447e0803d29fb826bb9b371ef9fd8da8739d538 /llvm/lib
parentdb2d9613d23c86080874f902a32725e56d5e1eba (diff)
downloadbcm5719-llvm-762edbc0748814eb88b1a66b0b54d106cbb02b65.tar.gz
bcm5719-llvm-762edbc0748814eb88b1a66b0b54d106cbb02b65.zip
don't assert and die on out of range (undefined) shifts. This fixes
PR3334. llvm-svn: 62352
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/ExecutionEngine/Interpreter/Execution.cpp20
1 files changed, 16 insertions, 4 deletions
diff --git a/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp b/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
index 872a40b6aea..f10360903f4 100644
--- a/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
+++ b/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
@@ -927,7 +927,11 @@ void Interpreter::visitShl(BinaryOperator &I) {
GenericValue Src1 = getOperandValue(I.getOperand(0), SF);
GenericValue Src2 = getOperandValue(I.getOperand(1), SF);
GenericValue Dest;
- Dest.IntVal = Src1.IntVal.shl(Src2.IntVal.getZExtValue());
+ if (Src2.IntVal.getZExtValue() < Src1.IntVal.getBitWidth())
+ Dest.IntVal = Src1.IntVal.shl(Src2.IntVal.getZExtValue());
+ else
+ Dest.IntVal = Src1.IntVal;
+
SetValue(&I, Dest, SF);
}
@@ -936,7 +940,11 @@ void Interpreter::visitLShr(BinaryOperator &I) {
GenericValue Src1 = getOperandValue(I.getOperand(0), SF);
GenericValue Src2 = getOperandValue(I.getOperand(1), SF);
GenericValue Dest;
- Dest.IntVal = Src1.IntVal.lshr(Src2.IntVal.getZExtValue());
+ if (Src2.IntVal.getZExtValue() < Src1.IntVal.getBitWidth())
+ Dest.IntVal = Src1.IntVal.lshr(Src2.IntVal.getZExtValue());
+ else
+ Dest.IntVal = Src1.IntVal;
+
SetValue(&I, Dest, SF);
}
@@ -944,8 +952,12 @@ void Interpreter::visitAShr(BinaryOperator &I) {
ExecutionContext &SF = ECStack.back();
GenericValue Src1 = getOperandValue(I.getOperand(0), SF);
GenericValue Src2 = getOperandValue(I.getOperand(1), SF);
- GenericValue Dest;
- Dest.IntVal = Src1.IntVal.ashr(Src2.IntVal.getZExtValue());
+ GenericValue Dest;
+ if (Src2.IntVal.getZExtValue() < Src1.IntVal.getBitWidth())
+ Dest.IntVal = Src1.IntVal.ashr(Src2.IntVal.getZExtValue());
+ else
+ Dest.IntVal = Src1.IntVal;
+
SetValue(&I, Dest, SF);
}
OpenPOWER on IntegriCloud