diff options
| author | Chris Lattner <sabre@nondot.org> | 2009-01-16 20:17:02 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2009-01-16 20:17:02 +0000 |
| commit | 9029cb836304cd2848f589dc79373d9b67eb48e0 (patch) | |
| tree | 9b1e0090347be15cc065ed79c83cfb23534f3787 /lib/ExecutionEngine | |
| parent | 71759c491c275ed37b6f97f04badf12ba9b3798c (diff) | |
| download | external_llvm-9029cb836304cd2848f589dc79373d9b67eb48e0.zip external_llvm-9029cb836304cd2848f589dc79373d9b67eb48e0.tar.gz external_llvm-9029cb836304cd2848f589dc79373d9b67eb48e0.tar.bz2 | |
don't assert and die on out of range (undefined) shifts. This fixes
PR3334.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@62352 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ExecutionEngine')
| -rw-r--r-- | lib/ExecutionEngine/Interpreter/Execution.cpp | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp index 872a40b..f103609 100644 --- a/lib/ExecutionEngine/Interpreter/Execution.cpp +++ b/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); } |