diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ExecutionEngine/Interpreter/Execution.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp index 1d7ec7a..9d07d2d 100644 --- a/lib/ExecutionEngine/Interpreter/Execution.cpp +++ b/lib/ExecutionEngine/Interpreter/Execution.cpp @@ -894,6 +894,7 @@ void Interpreter::nextInstruction() { // Do the 'next' command // If this is a call instruction, step over the call instruction... // TODO: ICALL, CALL WITH, ... if ((*ECStack.back().CurInst)->getOpcode() == Instruction::Call) { + unsigned StackSize = ECStack.size(); // Step into the function... if (executeInstruction()) { // Hit a breakpoint, print current instruction, then return to user... @@ -902,8 +903,11 @@ void Interpreter::nextInstruction() { // Do the 'next' command return; } - // Finish executing the function... - finish(); + // If we we able to step into the function, finish it now. We might not be + // able the step into a function, if it's external for example. + if (ECStack.size() != StackSize) + finish(); // Finish executing the function... + } else { // Normal instruction, just step... stepInstruction(); |