Skip to content
Snippets Groups Projects
Commit 9d0903b8 authored by Florian Angerer's avatar Florian Angerer
Browse files

Fix: Console output when exiting debugger.

parent 500e97a8
Branches
No related tags found
No related merge requests found
......@@ -45,6 +45,7 @@ import com.oracle.truffle.r.nodes.control.AbstractLoopNode;
import com.oracle.truffle.r.nodes.function.FunctionDefinitionNode;
import com.oracle.truffle.r.nodes.instrumentation.RInstrumentation;
import com.oracle.truffle.r.nodes.instrumentation.RSyntaxTags;
import com.oracle.truffle.r.runtime.JumpToTopLevelException;
import com.oracle.truffle.r.runtime.RArguments;
import com.oracle.truffle.r.runtime.RDeparse;
import com.oracle.truffle.r.runtime.RError;
......@@ -428,7 +429,7 @@ public class DebugHandling {
public void onReturnValue(EventContext context, VirtualFrame frame, Object result) {
if (!disabled()) {
CompilerDirectives.transferToInterpreter();
returnCleanup(frame);
returnCleanup(frame, false);
}
}
......@@ -436,12 +437,12 @@ public class DebugHandling {
public void onReturnExceptional(EventContext context, VirtualFrame frame, Throwable exception) {
if (!disabled()) {
CompilerDirectives.transferToInterpreter();
returnCleanup(frame);
returnCleanup(frame, exception instanceof JumpToTopLevelException);
}
}
private void returnCleanup(VirtualFrame frame) {
if (!implicit) {
private void returnCleanup(VirtualFrame frame, boolean jumpToTopLevel) {
if (!implicit && !jumpToTopLevel) {
print("exiting from: ", false);
printCall(frame);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment