aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Lewycky <nicholas@mxc.ca>2009-11-08 00:45:29 +0000
committerNick Lewycky <nicholas@mxc.ca>2009-11-08 00:45:29 +0000
commitdbf6f518e9dd68f87814a6f989399f2e40ea9f86 (patch)
treeb1893679c1e50effd17cab42e30387149709e871
parent36206182e12bb2728f88eaebf3082eb66d637635 (diff)
Fix the interpreter to not crash due to zeroext/signext
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@86428 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/ExecutionEngine/Interpreter/Execution.cpp10
-rw-r--r--test/ExecutionEngine/interpreter-ext.ll19
2 files changed, 19 insertions, 10 deletions
diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp
index 01bd2c7f89..b59cfd162f 100644
--- a/lib/ExecutionEngine/Interpreter/Execution.cpp
+++ b/lib/ExecutionEngine/Interpreter/Execution.cpp
@@ -882,16 +882,6 @@ void Interpreter::visitCallSite(CallSite CS) {
e = SF.Caller.arg_end(); i != e; ++i, ++pNum) {
Value *V = *i;
ArgVals.push_back(getOperandValue(V, SF));
- // Promote all integral types whose size is < sizeof(i32) into i32.
- // We do this by zero or sign extending the value as appropriate
- // according to the parameter attributes
- const Type *Ty = V->getType();
- if (Ty->isInteger() && (ArgVals.back().IntVal.getBitWidth() < 32)) {
- if (CS.paramHasAttr(pNum, Attribute::ZExt))
- ArgVals.back().IntVal = ArgVals.back().IntVal.zext(32);
- else if (CS.paramHasAttr(pNum, Attribute::SExt))
- ArgVals.back().IntVal = ArgVals.back().IntVal.sext(32);
- }
}
// To handle indirect calls, we must get the pointer value from the argument
diff --git a/test/ExecutionEngine/interpreter-ext.ll b/test/ExecutionEngine/interpreter-ext.ll
new file mode 100644
index 0000000000..4aef45a076
--- /dev/null
+++ b/test/ExecutionEngine/interpreter-ext.ll
@@ -0,0 +1,19 @@
+; RUN: lli -force-interpreter
+; Extending a value due to zeroext/signext will leave it the wrong size
+; causing problems later, such as a crash if you try to extend it again.
+
+define void @zero(i8 zeroext %foo) {
+ zext i8 %foo to i32
+ ret void
+}
+
+define void @sign(i8 signext %foo) {
+ sext i8 %foo to i32
+ ret void
+}
+
+define i32 @main() {
+ call void @zero(i8 0)
+ call void @sign(i8 0)
+ ret i32 0
+}