From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 8EA3A3858D37 for ; Fri, 28 Apr 2023 14:39:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8EA3A3858D37 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682692798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=xTVJo9kJPVWJodobwEaTnCbhk+i+DCLt+j6hl9DNXak=; b=eV14+3YXLlxxrJuGoPmtA173/bI2vn/6xfI4YSY+D9ohkXkgJTedSQbFAYHimQli3qQp1G ydvHs+PerPXn1fooxzfkBqDbrTbuwNEY07bnOsxwQsBhlmXBAaHiiw9AJ0MH6puhOceMI8 jtGo3C8ga9ZbuDW6QhTyYaED8ha/xh0= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-255-5kYhmHiEOKSoMwLfhqfx9w-1; Fri, 28 Apr 2023 10:39:56 -0400 X-MC-Unique: 5kYhmHiEOKSoMwLfhqfx9w-1 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-2fa5d643cd8so3197103f8f.2 for ; Fri, 28 Apr 2023 07:39:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682692795; x=1685284795; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xTVJo9kJPVWJodobwEaTnCbhk+i+DCLt+j6hl9DNXak=; b=C7FhIJO6+Ipb7tFyz0ryN6vkDLnFFSQM0p9k+S7ilyoUu1lFh/ob7f0B46jNt5Tu/W sFlN3vpDpehqjUMDWwjw0dMJjgnuQgvCAHkBWG4Sx2PdqL7vI7630WsRw5AxjS7jtW3k 3L6K/lxI1xMsMYCKxbPAz6m9yXeUphU4KSfOPlbpxVbwC8rNOBSbJARNILeUByORXc4A fap0C+vGBDyMPFHbfeEfIV5QqF9MhwhV4pKlUpcx4fIBPfFIAvwJzyw0vh+4W24ZltlZ uIF9xhttfDjWs6rbR5uVoXWTdqjw+iaXTi117rrBF6ivRgVvibo/BNW/ieQ+HsGcVckn UDJA== X-Gm-Message-State: AC+VfDy5luoJHT8Iq+vKI6VqM7Cm0xjPHuA4BTqpITpybRSw586M0CeO R8RkIG62MUwqgMjOcvzP+zfdNR9HHB0b0kz474RjfWOtR+PGLu78QjCj7w5QiIqJXs8qij1YW0n SKL70X1R3G+wWnGkp8p6lHA== X-Received: by 2002:a5d:4090:0:b0:2c5:3cd2:b8e with SMTP id o16-20020a5d4090000000b002c53cd20b8emr3632981wrp.1.1682692794738; Fri, 28 Apr 2023 07:39:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4tPQN6q/7+L4bDQuHwlVABluQYZkUK+165yQS+on5gyJafgjdnKQbNUxtUHIjgq32iFhycNw== X-Received: by 2002:a5d:4090:0:b0:2c5:3cd2:b8e with SMTP id o16-20020a5d4090000000b002c53cd20b8emr3632969wrp.1.1682692794354; Fri, 28 Apr 2023 07:39:54 -0700 (PDT) Received: from localhost (11.72.115.87.dyn.plus.net. [87.115.72.11]) by smtp.gmail.com with ESMTPSA id f4-20020a0560001b0400b002ffbf2213d4sm21407608wrz.75.2023.04.28.07.39.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Apr 2023 07:39:53 -0700 (PDT) From: Andrew Burgess To: Matti Puputti , gdb-patches@sourceware.org Cc: blarsen@redhat.com Subject: Re: [PATCH v3 1/1] gdb, infcmd: Support jump command with same line in multiple symtabs In-Reply-To: <20230417113243.2822544-1-matti.puputti@intel.com> References: <20230417113243.2822544-1-matti.puputti@intel.com> Date: Fri, 28 Apr 2023 15:39:52 +0100 Message-ID: <87zg6s9ikn.fsf@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Matti Puputti via Gdb-patches writes: > If a header file defining a static function is included in multiple source > files, each calling the function, and GDB is asked to jump to a line inside > that function, there would be multiple locations matching the target. The > solution in this commit is to select the location in the current symtab. > --- > gdb/infcmd.c | 14 ++++- > .../gdb.base/jump_multiple_objfiles.c | 30 ++++++++++ > .../gdb.base/jump_multiple_objfiles.exp | 57 +++++++++++++++++++ > .../gdb.base/jump_multiple_objfiles.h | 30 ++++++++++ > .../gdb.base/jump_multiple_objfiles_foo.c | 24 ++++++++ > 5 files changed, 154 insertions(+), 1 deletion(-) > create mode 100755 gdb/testsuite/gdb.base/jump_multiple_objfiles.c > create mode 100755 gdb/testsuite/gdb.base/jump_multiple_objfiles.exp > create mode 100755 gdb/testsuite/gdb.base/jump_multiple_objfiles.h > create mode 100755 gdb/testsuite/gdb.base/jump_multiple_objfiles_foo.c > > diff --git a/gdb/infcmd.c b/gdb/infcmd.c > index 103899432f7..3e7fdb374a4 100644 > --- a/gdb/infcmd.c > +++ b/gdb/infcmd.c > @@ -1079,7 +1079,19 @@ jump_command (const char *arg, int from_tty) > std::vector sals > = decode_line_with_last_displayed (arg, DECODE_LINE_FUNFIRSTLINE); > if (sals.size () != 1) > - error (_("Unreasonable jump request")); > + { > + /* If multiple sal-objects were found, try dropping those that aren't > + from the current symtab. */ > + sals.erase (std::remove_if (sals.begin (), sals.end (), > + [] (symtab_and_line &sal) > + { > + struct symtab_and_line cursal > + = get_current_source_symtab_and_line (); > + return sal.symtab != cursal.symtab; Maybe worrying about nothing, but I wonder if we should move the call to get_current_source_symtab_and_line outside of the lambda, and then capture cursal by reference. Also, the 'symtab_and_line &sal' can be made const. > + }), sals.end ()); > + if (sals.size () != 1) > + error (_("Unreasonable jump request")); > + } This all makes sense, but I think you need to update the docs. The docs currently say: ... If @var{locspec} resolves to more than one address, the command aborts before jumping. Which isn't true any more right? > > symtab_and_line &sal = sals[0]; > > diff --git a/gdb/testsuite/gdb.base/jump_multiple_objfiles.c b/gdb/testsuite/gdb.base/jump_multiple_objfiles.c > new file mode 100755 > index 00000000000..b54eede9eb1 > --- /dev/null > +++ b/gdb/testsuite/gdb.base/jump_multiple_objfiles.c > @@ -0,0 +1,30 @@ > +/* This testcase is part of GDB, the GNU debugger. > + > + Copyright 2021-2023 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 . */ > + > +#include "jump_multiple_objfiles.h" > + > +extern int foo (int n); > + > + > +int > +main () > +{ > + int n = foo (1); > + bar (n); > + > + return 0; > +} > diff --git a/gdb/testsuite/gdb.base/jump_multiple_objfiles.exp b/gdb/testsuite/gdb.base/jump_multiple_objfiles.exp > new file mode 100755 > index 00000000000..56bbc21c92e > --- /dev/null > +++ b/gdb/testsuite/gdb.base/jump_multiple_objfiles.exp > @@ -0,0 +1,57 @@ > +# Copyright 2021-2023 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 . */ > +# > +# Tests GDBs support for jump, when the source line is in multiple > +# object files. > + > + > +standard_testfile .c > +set srcfile2 jump_multiple_objfiles_foo.c > +set srcfile3 jump_multiple_objfiles.h If you rename 'jump_multiple_objfiles_foo.c' to 'jump_multiple_objfiles-foo.c', then you can replace these three lines with: standard_testfile .c -foo.c .h which is the preferred approach these days. > + > + > +if { [prepare_for_testing "failed to prepare" $testfile \ > + [list ${srcfile} ${srcfile2}]] } { > + return -1 > +} > + > +if { ![runto_main] } { > + perror "couldn't run to breakpoint" Drop this perror call. runto_main will FAIL if appropriate. Thanks, Andrew > + return -1 > +} > + > + > +set bar_first_line [gdb_get_line_number "bar-first-line" ${srcfile3}] > +set bar_middle_line [gdb_get_line_number "bar-middle-line" ${srcfile3}] > +set bar_last_line [gdb_get_line_number "bar-last-line" ${srcfile3}] > + > + > +# Set breakpoints in the function bar. Executable has two object files, > +# and both have a copy of the same source lines. Therefore breakpoints > +# will have two locations. > +gdb_breakpoint "${srcfile3}:${bar_first_line}" > +gdb_breakpoint "${srcfile3}:${bar_last_line}" > + > +# Run to the breakpoint in bar. > +gdb_continue_to_breakpoint "bar_first_line" \ > + ".*${srcfile3}:${bar_first_line}.*" > + > +# Jump within the function. Debugger shall be able to jump, even if the > +# target line is in two different object files. After jump, we will hit > +# the breakpoint at the last line of bar. > +gdb_test "jump ${bar_middle_line}" [multi_line \ > + "Continuing at ($hex).*" \ > + "Breakpoint ${decimal}.* at .*${srcfile3}:${bar_last_line}.*"] \ > + "Jump within the objectfile" > diff --git a/gdb/testsuite/gdb.base/jump_multiple_objfiles.h b/gdb/testsuite/gdb.base/jump_multiple_objfiles.h > new file mode 100755 > index 00000000000..0a3815e1808 > --- /dev/null > +++ b/gdb/testsuite/gdb.base/jump_multiple_objfiles.h > @@ -0,0 +1,30 @@ > +/* Copyright (C) 2021-2023 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 . */ > + > +#ifndef JUMP_MULTIPLE_OBJFILES_H > +#define JUMP_MULTIPLE_OBJFILES_H > + > +static int > +bar (int n) > +{ > + int retval = n; > + retval += 1; /* bar-first-line */ > + retval *= -1; /* bar-middle-line */ > + return retval; /* bar-last-line */ > +} > + > +#endif /* JUMP_MULTIPLE_OBJFILES_H */ > diff --git a/gdb/testsuite/gdb.base/jump_multiple_objfiles_foo.c b/gdb/testsuite/gdb.base/jump_multiple_objfiles_foo.c > new file mode 100755 > index 00000000000..16863c8594b > --- /dev/null > +++ b/gdb/testsuite/gdb.base/jump_multiple_objfiles_foo.c > @@ -0,0 +1,24 @@ > +/* This testcase is part of GDB, the GNU debugger. > + > + Copyright 2021-2023 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 . */ > + > +#include "jump_multiple_objfiles.h" > + > +int > +foo (int n) > +{ > + return bar (n); > +} > -- > 2.25.1 > > Intel Deutschland GmbH > Registered Address: Am Campeon 10, 85579 Neubiberg, Germany > Tel: +49 89 99 8853-0, www.intel.de > Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva > Chairperson of the Supervisory Board: Nicole Lau > Registered Office: Munich > Commercial Register: Amtsgericht Muenchen HRB 186928