diff options
Diffstat (limited to 'lib/Core')
| -rw-r--r-- | lib/Core/Executor.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp index 5632b208..b0af78a1 100644 --- a/lib/Core/Executor.cpp +++ b/lib/Core/Executor.cpp @@ -1499,15 +1499,7 @@ void Executor::executeInstruction(ExecutionState &state, KInstruction *ki) { case Instruction::Invoke: case Instruction::Call: { - CallSite cs; - unsigned argStart; - if (i->getOpcode()==Instruction::Call) { - cs = CallSite(cast<CallInst>(i)); - argStart = 1; - } else { - cs = CallSite(cast<InvokeInst>(i)); - argStart = 3; - } + CallSite cs(i); unsigned numArgs = cs.arg_size(); Function *f = getCalledFunction(cs, state); @@ -1521,7 +1513,7 @@ void Executor::executeInstruction(ExecutionState &state, KInstruction *ki) { arguments.reserve(numArgs); for (unsigned j=0; j<numArgs; ++j) - arguments.push_back(eval(ki, argStart+j, state).value); + arguments.push_back(eval(ki, j+1, state).value); if (!f) { // special case the call with a bitcast case |