From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by sourceware.org (Postfix) with ESMTPS id 9EAA33858C50 for ; Tue, 28 Mar 2023 16:06:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9EAA33858C50 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-ed1-x52b.google.com with SMTP id w9so51898886edc.3 for ; Tue, 28 Mar 2023 09:06:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1680019598; h=mime-version:user-agent:references:message-id:in-reply-to:subject :cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=0O9F26hqLE/kDmRrr3qSKpUASBbFFsRmpXYW0Pnobuk=; b=bjSW58sfDKOo5o+Kb2GNDz0s6T1gaBXoCIi5z4ioU5QbEUqiydyVhtuNG3nzOzg3uJ vf0JOWxSYy/8qSf7hUCFD5c7kKu34KKwh8solrJLD6RdjbSLp/lsIIx80e+4A+OnPBot 2PW2IasAC2W0UN470Z/nW3QO7c4qYtWCJiYVL/FKdv5FIrX0OUv+ElMFIS2qjR8u5geN QbK6XKn6uB56WfK8E9G42ZOSKhIJE0QpY8FWYorofxx2A7RSFJmhDO648pXnIJqSl8Jy AQWFzlCmkteY4kyTSVQQsug5aENxuSxOszUs8NrwnsvhxzSu4iZ/G36RCC0Vv/n2Aqix YTDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680019598; h=mime-version:user-agent:references:message-id:in-reply-to:subject :cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=0O9F26hqLE/kDmRrr3qSKpUASBbFFsRmpXYW0Pnobuk=; b=qf/kdrDkZ94ApEMqrWxZO3amLGpBCavJruQCysi/5W7qyCXa2an2Zuntc3uDseFPX2 rMvZf33BcF+xek2uNL//0d0vdfxwq4G99DDc2KSz5e8OZTAi7+VnzqVCnjlIuZWtURZR DV6o6PzyFUT9ypBM/9nBS6af0d+1YVRw+Gk5V95gaDsUgbNujS1R6iojWBK6moy0hmzO q3nXPzm7eyTW3EiVKxqVz+lrZuhMaPhDX+V/18RxrAQpkLZhWs94R9GLiSC+oGWnTcDd r1EvjX9cVH5ylIe6QkjR1HZ/JXXxbA8eIFySYOU8y/iEhwbhObrWqTYYhwYUVbyUQWpQ FFFg== X-Gm-Message-State: AAQBX9eDnFcZcweitOUWu87nWclgWl1/G+EXYxp/TzIR6Q+mmpNJGTEs 7bg/wv83e6Q5KPZP+Dok16iI/0xb/BTb7oYPfys= X-Google-Smtp-Source: AKy350YIY38bAZ4gCBsnp1HoT+DMyA8K09BLWiy+ZLJQz0P2km/diAGYrs/QTrjo0n452pM9PgjpAA== X-Received: by 2002:a17:907:1628:b0:88f:8a5:b4cd with SMTP id hb40-20020a170907162800b0088f08a5b4cdmr22110794ejc.1.1680019598428; Tue, 28 Mar 2023 09:06:38 -0700 (PDT) Received: from annie.orcam.me.uk (annie.orcam.me.uk. [2001:4190:8020::48]) by smtp.gmail.com with ESMTPSA id xf13-20020a17090731cd00b0093e5baadfe6sm5864850ejb.204.2023.03.28.09.06.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Mar 2023 09:06:38 -0700 (PDT) Date: Tue, 28 Mar 2023 17:06:36 +0100 (BST) From: "Maciej W. Rozycki" To: gdb-patches@sourceware.org cc: Richard Bunt Subject: [PATCH 1/3] GDB: Favor full symbol main name for backtrace stop In-Reply-To: Message-ID: References: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,KAM_ASCII_DIVIDERS,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Richard Bunt In the case where a Fortran program has a program name of "main" and there is also a minimal symbol called main, such as with programs built with GCC version 4.4.7 or below, the backtrace will erroneously stop at the minimal symbol rather than the user specified main, e.g.: (gdb) bt #0 bar () at .../gdb/testsuite/gdb.fortran/backtrace.f90:17 #1 0x0000000000402556 in foo () at .../gdb/testsuite/gdb.fortran/backtrace.f90:21 #2 0x0000000000402575 in main () at .../gdb/testsuite/gdb.fortran/backtrace.f90:31 #3 0x00000000004025aa in main () (gdb) FAIL: gdb.fortran/backtrace.exp: bt This patch fixes this issue by increasing the precedence of the full symbol when the language of the current frame is Fortran. Newer versions of GCC transform the program name to "MAIN__" in this case, avoiding the problem. Co-Authored-By: Maciej W. Rozycki --- gdb/frame.c | 25 ++++++++++++--------- gdb/testsuite/gdb.fortran/backtrace.exp | 38 ++++++++++++++++++++++++++++++++ gdb/testsuite/gdb.fortran/backtrace.f90 | 32 ++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 10 deletions(-) gdb-richard-favour-full-symbol-main-name-for-backtrace-stop.diff Index: src/gdb/frame.c =================================================================== --- src.orig/gdb/frame.c +++ src/gdb/frame.c @@ -2542,29 +2542,34 @@ inside_main_func (frame_info_ptr this_fr bound_minimal_symbol msymbol = lookup_minimal_symbol (name, NULL, current_program_space->symfile_object_file); - if (msymbol.minsym == nullptr) + + if (msymbol.minsym != nullptr) + sym_addr = msymbol.value_address (); + + /* Favor a full symbol in Fortran, for the case where the Fortran main + is also called "main". */ + if (msymbol.minsym == nullptr + || get_frame_language (this_frame) == language_fortran) { /* In some language (for example Fortran) there will be no minimal symbol with the name of the main function. In this case we should search the full symbols to see if we can find a match. */ struct block_symbol bs = lookup_symbol (name, NULL, VAR_DOMAIN, 0); - if (bs.symbol == nullptr) - return false; /* We might have found some unrelated symbol. For example, the Rust compiler can emit both a subprogram and a namespace with the same name in the same scope; and due to how gdb's symbol tables currently work, we can't request the one we'd prefer. */ - if (bs.symbol->aclass () != LOC_BLOCK) + if (bs.symbol != nullptr && bs.symbol->aclass () == LOC_BLOCK) + { + const struct block *block = bs.symbol->value_block (); + gdb_assert (block != nullptr); + sym_addr = block->start (); + } + else if (msymbol.minsym == nullptr) return false; - - const struct block *block = bs.symbol->value_block (); - gdb_assert (block != nullptr); - sym_addr = block->start (); } - else - sym_addr = msymbol.value_address (); /* Convert any function descriptor addresses into the actual function code address. */ Index: src/gdb/testsuite/gdb.fortran/backtrace.exp =================================================================== --- /dev/null +++ src/gdb/testsuite/gdb.fortran/backtrace.exp @@ -0,0 +1,38 @@ +# Copyright 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 . + +require allow_fortran_tests + +load_lib fortran.exp + +standard_testfile .f90 + +if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f90}]} { + return -1 +} + +if {![fortran_runto_main]} { + perror "Could not run to main." + return +} + +gdb_breakpoint [gdb_get_line_number "Break here"] +gdb_continue_to_breakpoint "continue to bar" + +gdb_test "bt" \ + [multi_line \ + "#0\[ \t\]*bar \\(\\) at \[^\r\n\]+" \ + "#1\[ \t\]*$hex in foo \\(\\) at \[^\r\n\]+" \ + "#2\[ \t\]*$hex in \(?:MAIN__\|main\) \\(\\) at \[^\r\n\]+" ] Index: src/gdb/testsuite/gdb.fortran/backtrace.f90 =================================================================== --- /dev/null +++ src/gdb/testsuite/gdb.fortran/backtrace.f90 @@ -0,0 +1,32 @@ +! Copyright 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 . + +subroutine bar () + return ! Break here +end subroutine bar + +subroutine foo () + call bar () +end subroutine foo + +program main + interface + subroutine bar () + end subroutine bar + subroutine foo () + end subroutine foo + end interface + call foo () +end program main