From f8e621c4845664a9ad32b5f4b8fe3db2b134dac3 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Thu, 5 Aug 2010 17:53:23 +0000 Subject: Store CallInst and InvokeInst operands in a fixed order: function, arg0, arg1, ... git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@110352 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Core/Executor.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'lib/Core') 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(i)); - argStart = 1; - } else { - cs = CallSite(cast(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