From 919d0e395843f38e1534fed21e1c85baa472cde7 Mon Sep 17 00:00:00 2001 From: eutarass Date: Fri, 3 Dec 2010 04:13:21 +0000 Subject: 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 --- .../org/eclipse/tm/internal/tcf/debug/actions/TCFActionStepInto.java | 4 ++-- 1 file 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(); } -- cgit v1.2.3