Fix problem next'ing over an external method
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1027 91177308-0d34-0410-b5e6-96231b3b80d8
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 @@
// 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 @@
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();