Use CallSites for call sites, instead of CallInsts. A revolutionary concept.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9784 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp
index 4d1a3e6..739e57c 100644
--- a/lib/ExecutionEngine/Interpreter/Execution.cpp
+++ b/lib/ExecutionEngine/Interpreter/Execution.cpp
@@ -453,10 +453,10 @@
// If we have a previous stack frame, and we have a previous call,
// fill in the return value...
ExecutionContext &CallingSF = ECStack.back();
- if (CallingSF.Caller) {
- if (CallingSF.Caller->getType() != Type::VoidTy) // Save result...
- SetValue(CallingSF.Caller, Result, CallingSF);
- CallingSF.Caller = 0; // We returned from the call...
+ if (CallingSF.Caller.getInstruction()) {
+ if (CallingSF.Caller.getType() != Type::VoidTy) // Save result...
+ SetValue(CallingSF.Caller.getInstruction(), Result, CallingSF);
+ CallingSF.Caller = CallSite(); // We returned from the call...
}
}
}
@@ -639,7 +639,7 @@
void Interpreter::visitCallInst(CallInst &I) {
ExecutionContext &SF = ECStack.back();
- SF.Caller = &I;
+ SF.Caller = CallSite(&I);
std::vector<GenericValue> ArgVals;
ArgVals.reserve(I.getNumOperands()-1);
for (unsigned i = 1; i < I.getNumOperands(); ++i) {
@@ -804,8 +804,8 @@
//
void Interpreter::callFunction(Function *F,
const std::vector<GenericValue> &ArgVals) {
- assert((ECStack.empty() || ECStack.back().Caller == 0 ||
- ECStack.back().Caller->getNumOperands()-1 == ArgVals.size()) &&
+ assert((ECStack.empty() || ECStack.back().Caller.getInstruction() == 0 ||
+ ECStack.back().Caller.arg_size() == ArgVals.size()) &&
"Incorrect number of arguments passed into function call!");
// Make a new stack frame... and fill it in.
ECStack.push_back(ExecutionContext());