From cb172f985158d7fa743bc5bf4b44ad073a86f946 Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Tue, 15 Dec 2015 15:03:22 +0100 Subject: [PATCH] [disassembly] Do not reuse label position for creating bp annotation --- .../disassembly/provisional/DisassemblyAnnotationModel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblyAnnotationModel.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblyAnnotationModel.java index 04d0bf4fb5b..89848d1c955 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblyAnnotationModel.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblyAnnotationModel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Wind River Systems, Inc. and others. + * Copyright (c) 2011, 2015 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -75,7 +75,7 @@ public class DisassemblyAnnotationModel extends AnnotationModel { if (candidate != null && candidate.startsWith(label)) { // exact match or followed by () if (candidate.length() == labelLen || candidate.charAt(labelLen) == '(') { - return position; + return new Position(position.offset, position.length); } } }