From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10966 invoked by alias); 29 Nov 2011 03:22:29 -0000 Received: (qmail 10958 invoked by uid 22791); 29 Nov 2011 03:22:29 -0000 X-SWARE-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,KAM_STOCKGEN X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 29 Nov 2011 03:22:16 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 8F48A2BAD32; Mon, 28 Nov 2011 22:22:15 -0500 (EST) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id v9aEeXB8b2T4; Mon, 28 Nov 2011 22:22:15 -0500 (EST) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 5F4A62BAD08; Mon, 28 Nov 2011 22:22:15 -0500 (EST) Received: by joel.gnat.com (Postfix, from userid 1000) id 92BD2145615; Mon, 28 Nov 2011 22:22:02 -0500 (EST) Date: Tue, 29 Nov 2011 03:22:00 -0000 From: Joel Brobecker To: Tom Tromey Cc: gdb-patches@sources.redhat.com Subject: Re: GDB 7.4 branching status? (2011-11-23) Message-ID: <20111129032202.GQ24943@adacore.com> References: <20111123163917.GA13809@adacore.com> <20111123232406.GQ13809@adacore.com> <20111124105603.GA91879@adacore.com> <20111124163304.GR13809@adacore.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="n+lFg1Zro7sl44OB" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2011-11/txt/msg00800.txt.bz2 --n+lFg1Zro7sl44OB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 437 This patch is optional, and related to the problem that got fixed by your latest patch series, mentioned in my previous email: http://www.sourceware.org/ml/gdb-patches/2011-11/msg00799.html I still noticed a call to skip_prologue_sal without a check of self->funfirstline. Perhaps there is no situation where this might make a difference, but I thought it might be good to add the check anyways, just to be on the safe side. -- Joel --n+lFg1Zro7sl44OB Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0004-call-skip_prologue_sal-only-if-self-funfirstline.patch" Content-length: 1025 >From abc12be76deaa5632094c1507f4dff284bd36c2b Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Mon, 28 Nov 2011 16:08:40 -0800 Subject: [PATCH 4/5] call skip_prologue_sal only if self->funfirstline gdb/ChangeLog: * linespec.c (decode_all_digits): Call skip_prologue_sal only if self->funfirstline. --- gdb/linespec.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/gdb/linespec.c b/gdb/linespec.c index 06b1dd2..146163a 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -2433,7 +2433,8 @@ decode_all_digits (struct linespec_state *self, /* Make sure the line matches the request, not what was found. */ - skip_prologue_sal (&intermediate_results.sals[i]); + if (self->funfirstline) + skip_prologue_sal (&intermediate_results.sals[i]); intermediate_results.sals[i].line = val.line; add_sal_to_sals (self, &values, &intermediate_results.sals[i], sym ? SYMBOL_NATURAL_NAME (sym) : NULL); -- 1.7.1 --n+lFg1Zro7sl44OB--