Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreutarass2010-12-03 04:13:21 +0000
committereutarass2010-12-03 04:13:21 +0000
commit919d0e395843f38e1534fed21e1c85baa472cde7 (patch)
tree01ddad69194e7d2d2ce018e18eb70ad308e6d1af
parent0e513d02ddca274f7434df520d9c256b9c75bf9c (diff)
downloadorg.eclipse.tcf-919d0e395843f38e1534fed21e1c85baa472cde7.tar.gz
org.eclipse.tcf-919d0e395843f38e1534fed21e1c85baa472cde7.tar.xz
org.eclipse.tcf-919d0e395843f38e1534fed21e1c85baa472cde7.zip
TCF Debugger: fixed: step into line command should not continue stepping over code that has no line number info: it can cause stepping to continue forever
-rw-r--r--plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions/TCFActionStepInto.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions/TCFActionStepInto.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions/TCFActionStepInto.java
index 4f7f11ffd..ec39d51a0 100644
--- a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions/TCFActionStepInto.java
+++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions/TCFActionStepInto.java
@@ -152,7 +152,7 @@ public abstract class TCFActionStepInto extends TCFAction implements IRunControl
if (!line_info.validate(this)) return;
TCFSourceRef ref = line_info.getData();
if (ref == null || ref.area == null) {
- // No line info for current PC, continue stepping
+ exit(null);
}
else if (isSameLine(source_ref.area, ref.area)) {
setSourceRef(ref);
@@ -219,7 +219,7 @@ public abstract class TCFActionStepInto extends TCFAction implements IRunControl
if (exited) return;
rc.removeListener(this);
exited = true;
- setActionResult(ctx.getID(), reason);
+ if (error == null) setActionResult(ctx.getID(), reason);
done();
}

Back to the top