Attachment 180466 Details for Bug 327061 – Run To Line Mac patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Run To Line Mac patch

MacRunToLine-patch.txt (text/plain), 2.65 KB, created by Marc-André Laperle

on 2010-10-07 21:38:48 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Marc-André Laperle

Created: 2010-10-07 21:38:48 EDT

Size: 2.65 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.dsf.gdb
>Index: src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl.java,v
>retrieving revision 1.16
>diff -u -r1.16 GDBRunControl.java
>--- src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl.java	20 May 2010 14:34:58 -0000	1.16
>+++ src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl.java	8 Oct 2010 01:00:52 -0000
>@@ -43,6 +43,7 @@
> import org.eclipse.cdt.dsf.mi.service.command.events.MIStoppedEvent;
> import org.eclipse.cdt.dsf.mi.service.command.events.MIThreadExitEvent;
> import org.eclipse.cdt.dsf.mi.service.command.output.MIBreakInsertInfo;
>+import org.eclipse.cdt.dsf.mi.service.command.output.MIFrame;
> import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
> import org.eclipse.cdt.dsf.service.DsfServiceEventHandler;
> import org.eclipse.cdt.dsf.service.DsfSession;
>@@ -361,8 +362,7 @@
>     		if (e instanceof MIBreakpointHitEvent) {
>     			bpId = ((MIBreakpointHitEvent)e).getNumber();
>     		}
>-			String fileLocation = e.getFrame().getFile() + ":" + e.getFrame().getLine();  //$NON-NLS-1$
>-			String addrLocation = e.getFrame().getAddress();
>+
> 			// Here we check three different things to see if we are stopped at the right place
> 			// 1- The actual location in the file.  But this does not work for breakpoints that
> 			//    were set on non-executable lines
>@@ -374,9 +374,18 @@
> 			// So this works for the large majority of cases.  The case that won't work is when the user
> 			// does a runToLine to a line that is non-executable AND has another breakpoint AND
> 			// has multiple addresses for the breakpoint.  I'm mean, come on!
>-			if (fileLocation.equals(fRunToLineActiveOperation.getFileLocation()) ||
>-				addrLocation.equals(fRunToLineActiveOperation.getAddrLocation()) ||
>-				bpId == fRunToLineActiveOperation.getBreakointId()) {
>+			boolean equalFileLocation = false;
>+			boolean equalAddrLocation = false;
>+			boolean equalBpId = bpId == fRunToLineActiveOperation.getBreakointId();
>+			MIFrame frame = e.getFrame();
>+			if(frame != null) {
>+				String fileLocation = frame.getFile() + ":" + frame.getLine();  //$NON-NLS-1$
>+				String addrLocation = frame.getAddress();
>+				equalFileLocation = fileLocation.equals(fRunToLineActiveOperation.getFileLocation());
>+				equalAddrLocation = addrLocation.equals(fRunToLineActiveOperation.getAddrLocation());
>+			}
>+			
>+			if (equalFileLocation || equalAddrLocation || equalBpId) {
>     			// We stopped at the right place.  All is well.
> 				fRunToLineActiveOperation = null;
>     		} else {

Flags:

malaperle: iplog-

Actions: View | Diff

Attachments on bug 327061: 180295 | 180466