From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10177 invoked by alias); 29 Nov 2011 03:19:44 -0000 Received: (qmail 10164 invoked by uid 22791); 29 Nov 2011 03:19:43 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00 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:19:29 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 15C532BAF2B; Mon, 28 Nov 2011 22:19:29 -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 FQI82h5q3YnV; Mon, 28 Nov 2011 22:19:29 -0500 (EST) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 81B3F2BAE1E; Mon, 28 Nov 2011 22:19:28 -0500 (EST) Received: by joel.gnat.com (Postfix, from userid 1000) id 3F8CE145615; Mon, 28 Nov 2011 22:19:15 -0500 (EST) Date: Tue, 29 Nov 2011 03:19:00 -0000 From: Joel Brobecker To: Tom Tromey Cc: gdb-patches@sources.redhat.com Subject: [RFA/commit/testcase] "info line" should not skip prologues (was: "Re: GDB 7.4 branching status? (2011-11-23)") Message-ID: <20111129031915.GP24943@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="YToU2i3Vx8H2dn7O" 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/msg00799.txt.bz2 --YToU2i3Vx8H2dn7O Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 1186 This is an issue that I discovered in your previous set of patches, but got fixed in this iteration :-). Nonetheless, I wrote a testcase, so I'm sending it here. I think I should commit it independenly of your series. I had described the problem as follow: > The "info line" command skips function prologues, but it shouldn't. > Consider for instance the new testcase provided with this patch. > The code looks like this: > > 17 > 18 int twice (int i) { /* THIS LINE */ > 19 /* We purposefully put the return type, function prototype and > 20 opening curly brace on the same line, in an effort to make sure > 21 that the function prologue would be associated to that line. */ > 22 return 2 * i; > 23 } > > Without this patch, GDB would report the following address range > for line 18: > > (gdb) info line 18 > Line 18 of "[...]/infoline.c" is at address 0x40049b > but contains no code. > > The indicator that the prologue was skipped comes from the fact that > the address chosen is at twice+7, not twice+0. -- Joel --YToU2i3Vx8H2dn7O Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0003-decode_all_digits-Skip-prologue-only-if-self-funfirs.patch" Content-length: 3377 >From c21988ba1e257d0f20f2bdaf9677b867bfa0aeb0 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Fri, 25 Nov 2011 11:42:26 -0800 Subject: info line should not skip function prologues. gdb/testsuite/ChangeLog: * gdb.base/infoline.c, gdb.base/infoline.exp: New files. --- gdb/testsuite/gdb.base/infoline.c | 30 ++++++++++++++++++++++++++++++ gdb/testsuite/gdb.base/infoline.exp | 30 ++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) create mode 100644 gdb/testsuite/gdb.base/infoline.c create mode 100644 gdb/testsuite/gdb.base/infoline.exp diff --git a/gdb/testsuite/gdb.base/infoline.c b/gdb/testsuite/gdb.base/infoline.c new file mode 100644 index 0000000..7b0da2b --- /dev/null +++ b/gdb/testsuite/gdb.base/infoline.c @@ -0,0 +1,30 @@ +/* Copyright 2011 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +int twice (int i) { /* THIS LINE */ + /* We purposefully put the return type, function prototype and + opening curly brace on the same line, in an effort to make sure + that the function prologue would be associated to that line. */ + return 2 * i; +} + +int +main (void) +{ + int t = twice (1); + return 0; +} diff --git a/gdb/testsuite/gdb.base/infoline.exp b/gdb/testsuite/gdb.base/infoline.exp new file mode 100644 index 0000000..41ff894 --- /dev/null +++ b/gdb/testsuite/gdb.base/infoline.exp @@ -0,0 +1,30 @@ +# Copyright (C) 2011 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +set testfile infoline +set srcfile ${testfile}.c + +if { [prepare_for_testing ${testfile}.exp ${testfile}] } { + return -1 +} + +clean_restart ${testfile} + +# Verify that the "info line" command does not skip function prologues. +# If it did, GDB would tell us that the line we're interested in starts +# at where N is different from zero. +set fun_decl_line [gdb_get_line_number "THIS LINE"] +gdb_test "info line ${srcfile}:${fun_decl_line}" \ + "Line ${fun_decl_line} of \".*${testfile}\.c\" starts at address 0x\[0-9a-f\]+ and ends at .*" -- 1.7.1 --YToU2i3Vx8H2dn7O--