From patchwork Fri Feb 24 17:51:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 65610 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6A7CD3853567 for ; Fri, 24 Feb 2023 17:52:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6A7CD3853567 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1677261120; bh=JFRKMs5akb0DGaU3qLq2bTzAjWYxrWKKATdD5/eYShY=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=GT6Ixv8grZ6wFnRDMw4ML3duBUy/vCIXg0BTvz1LVd1P+jcxuNPb2NzLXJIT5m4jJ wYjkpDuIISY+7Rr2FimLX/DRAaK5t2FmHHaukOz+zUl2uR55WF+JZuPzzKM9KMsH5z 2PfML9SZDpYqWNsSOCmgZzZrRLedhS4OYhSphoxM= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) by sourceware.org (Postfix) with ESMTPS id B41A9385840F for ; Fri, 24 Feb 2023 17:51:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B41A9385840F Received: by mail-il1-x12d.google.com with SMTP id o8so146127ilt.13 for ; Fri, 24 Feb 2023 09:51:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=JFRKMs5akb0DGaU3qLq2bTzAjWYxrWKKATdD5/eYShY=; b=dYPSxuIJ0cpQI1k1tjQUPxZWfDL4iivLUa5vqvGrN6tfxPKg79rwXKqQgP4O745GZU muNnp0E1cRg49EzqyijJAitH+6saMIRklJ5i67wmXRpvJ01yn3Yt2Aw/7b2bSKoHde0D cpavzHD2E6OdSlQhv3DFmou2UQYeCxYBJ71PdXAow+Y59umF7HHq8lW9l9waNCCT8Txr sKIoei732E7rS2tSrznmytKUymgbE6rovE+21QRE9fXpj/X4msDIpTWxZph/62W/AL2+ kcZs8OioPKNAT7nylgYWrIeODnoyR0GH5FrR9D69BTNA8s3yNlp/OE6fzz78tNWza7JI 7myw== X-Gm-Message-State: AO0yUKUhEWKRw5bkGLITkTo/SsCqrk11wzKel8RO8xqXOOAmhyb9KIcd EJahQG5qy96YyVdk7n1DU9ojeIUp3gMLYY9D X-Google-Smtp-Source: AK7set9AU+2+doGKs3RYnA2pyBOOoO7ASC3ibCkw3gXeJv/ELM5kxC6NtDqiuQ5YN5bY4HMoyqygHg== X-Received: by 2002:a92:c242:0:b0:316:fcc6:6ec0 with SMTP id k2-20020a92c242000000b00316fcc66ec0mr5829141ilo.0.1677261094889; Fri, 24 Feb 2023 09:51:34 -0800 (PST) Received: from localhost.localdomain (75-166-130-93.hlrn.qwest.net. [75.166.130.93]) by smtp.gmail.com with ESMTPSA id s26-20020a02cc9a000000b003c4f902cca5sm2973817jap.172.2023.02.24.09.51.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 09:51:34 -0800 (PST) To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Fix crash in inside_main_func Date: Fri, 24 Feb 2023 10:51:24 -0700 Message-Id: <20230224175124.2689187-1-tromey@adacore.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" gdb 13.1 crashes while running the rust compiler's debugger tests. The crash has a number of causes. First, the rust compiler still uses the C++-like _Z mangling, but with its own twist -- some hex digits added to the end of a symbol. So, while gdb finds the correct name of "main": (top-gdb) p name $13 = 0x292e0c0 "rustc_gdb_1031745::main" It isn't found in the minsyms, because C++ demangling yields: [99] t 0x90c0 _ZN17rustc_gdb_10317454main17h5b5be7fe16a97225E section .text rustc_gdb_1031745::main::h5b5be7fe16a97225 zko06yobckx336v This could perhaps be fixed. I also filed a new PR to suggest preferring the linkage name of the main program. Next, the rust compiler emits both a DW_TAG_subprogram and a DW_TAG_namespace for "main". This happens because the file is named "main.rs" -- i.e., the bug is specific to the source file name. The crash also seems to require the nested function inside of 'main', at least for me. The namespace always is generated, but perhaps this changes the ordering in the DWARF. When inside_main_func looks up the main symbol, it finds the namespace symbol rather than the function. (I filed a bug about fixing gdb's symbol tables -- long overdue.) Meanwhile, as I think it's important to fix this crash sooner rather than later, this patch changes inside_main_func to check that the symbol that is found is LOC_BLOCK. This perhaps should have been done in the first place, anyway. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30158 --- gdb/frame.c | 8 ++++++ gdb/testsuite/gdb.rust/main-crash.exp | 35 +++++++++++++++++++++++++++ gdb/testsuite/gdb.rust/main.rs | 30 +++++++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 gdb/testsuite/gdb.rust/main-crash.exp create mode 100644 gdb/testsuite/gdb.rust/main.rs diff --git a/gdb/frame.c b/gdb/frame.c index 9b867b6cd9c..de3c7de440d 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -2551,6 +2551,14 @@ inside_main_func (frame_info_ptr this_frame) 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) + return false; + const struct block *block = bs.symbol->value_block (); gdb_assert (block != nullptr); sym_addr = block->start (); diff --git a/gdb/testsuite/gdb.rust/main-crash.exp b/gdb/testsuite/gdb.rust/main-crash.exp new file mode 100644 index 00000000000..9c513f91c1d --- /dev/null +++ b/gdb/testsuite/gdb.rust/main-crash.exp @@ -0,0 +1,35 @@ +# Copyright (C) 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 . + +# Regression test for a crash in inside_main_func. + +load_lib rust-support.exp +require allow_rust_tests + +standard_testfile main.rs +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug rust}]} { + return -1 +} + +set line [gdb_get_line_number "BREAK"] +# The bug was that this would crash. +if {![runto ${srcfile}:$line]} { + untested "could not run to breakpoint" + return -1 +} + +# Test that gdb is alive. +gdb_test "print 23" " = 23" diff --git a/gdb/testsuite/gdb.rust/main.rs b/gdb/testsuite/gdb.rust/main.rs new file mode 100644 index 00000000000..8902446551e --- /dev/null +++ b/gdb/testsuite/gdb.rust/main.rs @@ -0,0 +1,30 @@ +// Copyright (C) 2016-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 . + +#![allow(dead_code)] +#![allow(unused_variables)] +#![allow(unused_assignments)] + +fn global_fn(x: u8) { + // BREAK +} + +fn main() { + fn nested(y: u8) { + global_fn(y) + } + + nested(23); +}