The interpreter assumes that the caller of runFunction() must be lli, and
therefore the function being called must be a main() returning an int. The
consequences when these assumptions are false are not good, so don't assume
them.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@26031 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp
index a41d12a..4104ff3 100644
--- a/lib/ExecutionEngine/Interpreter/Execution.cpp
+++ b/lib/ExecutionEngine/Interpreter/Execution.cpp
@@ -553,7 +553,7 @@
/// Pop the last stack frame off of ECStack and then copy the result
/// back into the result variable if we are not returning void. The
-/// result variable may be the ExitCode, or the Value of the calling
+/// result variable may be the ExitValue, or the Value of the calling
/// CallInst if there was a previous stack frame. This method may
/// invalidate any ECStack iterators you have. This method also takes
/// care of switching to the normal destination BB, if we are returning
@@ -566,9 +566,9 @@
if (ECStack.empty()) { // Finished main. Put result into exit code...
if (RetTy && RetTy->isIntegral()) { // Nonvoid return type?
- ExitCode = Result.IntVal; // Capture the exit code of the program
+ ExitValue = Result; // Capture the exit value of the program
} else {
- ExitCode = 0;
+ memset(&ExitValue, 0, sizeof(ExitValue));
}
} else {
// If we have a previous stack frame, and we have a previous call,
diff --git a/lib/ExecutionEngine/Interpreter/Interpreter.cpp b/lib/ExecutionEngine/Interpreter/Interpreter.cpp
index 2dba4d6..af23bf1 100644
--- a/lib/ExecutionEngine/Interpreter/Interpreter.cpp
+++ b/lib/ExecutionEngine/Interpreter/Interpreter.cpp
@@ -50,10 +50,11 @@
//
Interpreter::Interpreter(Module *M, bool isLittleEndian, bool isLongPointer,
IntrinsicLowering *il)
- : ExecutionEngine(M), ExitCode(0),
+ : ExecutionEngine(M),
TD("lli", isLittleEndian, isLongPointer ? 8 : 4, isLongPointer ? 8 : 4,
isLongPointer ? 8 : 4), IL(il) {
+ memset(&ExitValue, 0, sizeof(ExitValue));
setTargetData(TD);
// Initialize the "backend"
initializeExecutionEngine();
@@ -100,8 +101,6 @@
// Start executing the function.
run();
- GenericValue rv;
- rv.IntVal = ExitCode;
- return rv;
+ return ExitValue;
}
diff --git a/lib/ExecutionEngine/Interpreter/Interpreter.h b/lib/ExecutionEngine/Interpreter/Interpreter.h
index 180d092..e45b4c6 100644
--- a/lib/ExecutionEngine/Interpreter/Interpreter.h
+++ b/lib/ExecutionEngine/Interpreter/Interpreter.h
@@ -80,7 +80,7 @@
// Interpreter - This class represents the entirety of the interpreter.
//
class Interpreter : public ExecutionEngine, public InstVisitor<Interpreter> {
- int ExitCode; // The exit code to be returned by the lli util
+ GenericValue ExitValue; // The return value of the called function
TargetData TD;
IntrinsicLowering *IL;