From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt1-x835.google.com (mail-qt1-x835.google.com [IPv6:2607:f8b0:4864:20::835]) by sourceware.org (Postfix) with ESMTPS id 91BF03858400 for ; Thu, 22 Sep 2022 20:21:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 91BF03858400 Received: by mail-qt1-x835.google.com with SMTP id w2so7145773qtv.9 for ; Thu, 22 Sep 2022 13:21:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=0xyvfhHgflG97jTyOZarJ5UNZRYidqjJe6LbyebZUZw=; b=kX6lOjO6u3oZYdEBFMqgsZLMA0fXLWTfwiulOByNk2v2NFYWjbTB/8e6TyKshHkzhv mh9kpKl3Figs2tNJzuQKXzivFMqCj6YYLTG8m1vFWkXYFQ6dxmtvRURJZu/EP00em2sz UX1JL75XAacLRO07V7TEIRuJG8S8KyoGA1JgrmkewhxCyWkYhfE2ZwEQPaWunw2XhS9a dfUJu4COsmcRclQSKqYFJhE+Lv9YNgmbPiN4HjjA/cNv2OQV7BNbqxPiHEFtNLDo+f2w CE/O5yOsgIx5dwThTeQxLRn5uNBZoorWIRt1gF68eHYUeTEO/rony+OZ1MiglpTaieAf hMFg== X-Gm-Message-State: ACrzQf30UwZBsoJkofOwLYwRpdRx0QnaM4h5iXvBCTtwlPn3bfYdZ9AL ua1n+v+kYzaf5p5vdR2Bhb3ggEbLQavT4w== X-Google-Smtp-Source: AMsMyM4WlnrWQliu7ilJuEXFdFcmSiZNPmg5826OdW93Sz8xV6kN7PIzHRg1SzCyi7CkjnPfdmdjDw== X-Received: by 2002:a05:622a:1491:b0:35b:bbcc:3b17 with SMTP id t17-20020a05622a149100b0035bbbcc3b17mr4459412qtx.3.1663878065121; Thu, 22 Sep 2022 13:21:05 -0700 (PDT) Received: from localhost.localdomain (71-211-160-49.hlrn.qwest.net. [71.211.160.49]) by smtp.gmail.com with ESMTPSA id cp4-20020a05622a420400b0035cdd7a42d0sm3869093qtb.22.2022.09.22.13.21.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Sep 2022 13:21:04 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 1/2] Improve Ada support in .gdb_index Date: Thu, 22 Sep 2022 14:20:53 -0600 Message-Id: <20220922202054.2773698-2-tromey@adacore.com> X-Mailer: git-send-email 2.34.3 In-Reply-To: <20220922202054.2773698-1-tromey@adacore.com> References: <20220922202054.2773698-1-tromey@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_STOCKGEN, 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-List-Received-Date: Thu, 22 Sep 2022 20:21:10 -0000 The cooked index work changed how .gdb_index is constructed, and in the process broke .gdb_index support. This is PR symtab/29179. This patch partially fixes the problem. It arranges for Ada names to be encoded in the form expected by the index code. In particular, linkage names for Ada are emitted, including the "main" name; names are Ada-encoded; and names are no longer case-folded, something that prevented operator names from round-tripping correctly. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29179 --- gdb/ada-lang.c | 8 +++++--- gdb/ada-lang.h | 2 +- gdb/dwarf2/index-write.c | 42 ++++++++++++++++++++++++++++++++-------- 3 files changed, 40 insertions(+), 12 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index d539c50602c..88248b5c7a2 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -1146,12 +1146,14 @@ ada_fold_name (gdb::string_view name, bool throw_on_error = false) return fold_storage.c_str (); } -/* The "encoded" form of DECODED, according to GNAT conventions. */ +/* The "encoded" form of DECODED, according to GNAT conventions. If + FOLD is true (the default), case-fold any ordinary symbol. Symbols + with <...> quoting are not folded in any case. */ std::string -ada_encode (const char *decoded) +ada_encode (const char *decoded, bool fold) { - if (decoded[0] != '<') + if (fold && decoded[0] != '<') decoded = ada_fold_name (decoded); return ada_encode_1 (decoded, true); } diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h index 0dcdb56c198..cc8db6b5723 100644 --- a/gdb/ada-lang.h +++ b/gdb/ada-lang.h @@ -316,7 +316,7 @@ extern struct type *ada_get_base_type (struct type *); extern struct type *ada_check_typedef (struct type *); -extern std::string ada_encode (const char *); +extern std::string ada_encode (const char *, bool fold = true); extern const char *ada_enum_name (const char *); diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c index 4cc0ee53070..6940a0ce3be 100644 --- a/gdb/dwarf2/index-write.c +++ b/gdb/dwarf2/index-write.c @@ -1112,21 +1112,47 @@ write_cooked_index (cooked_index_vector *table, htab_up var_names (htab_create_alloc (10, htab_hash_string, htab_eq_string, nullptr, xcalloc, xfree)); + const char *main_for_ada = main_name (); + for (const cooked_index_entry *entry : table->all_entries ()) { - /* GDB never put linkage names into .gdb_index. The theory here - is that a linkage name will normally be in the minimal - symbols anyway, so including it in the index is usually - redundant -- and the cases where it would not be redundant - are rare and not worth supporting. */ - if ((entry->flags & IS_LINKAGE) != 0) - continue; - const auto it = cu_index_htab.find (entry->per_cu); gdb_assert (it != cu_index_htab.cend ()); const char *name = entry->full_name (&symtab->m_string_obstack); + if (entry->per_cu->lang () == language_ada) + { + /* We want to ensure that the Ada main function's name + appears verbatim in the index. However, this name will + be of the form "_ada_mumble", and will be rewritten by + ada_decode. So, recognize it specially here and add it + to the index by hand. */ + if (entry->tag == DW_TAG_subprogram + && strcmp (main_for_ada, name) == 0) + { + /* Leave it alone. */ + } + else + { + /* In order for the index to work when read back into + gdb, it has to use the encoded name, with any + suffixes stripped. */ + std::string encoded = ada_encode (name, false); + name = obstack_strdup (&symtab->m_string_obstack, + encoded.c_str ()); + } + } + else if ((entry->flags & IS_LINKAGE) != 0) + { + /* GDB never put linkage names into .gdb_index. The theory + here is that a linkage name will normally be in the + minimal symbols anyway, so including it in the index is + usually redundant -- and the cases where it would not be + redundant are rare and not worth supporting. */ + continue; + } + gdb_index_symbol_kind kind; if (entry->tag == DW_TAG_subprogram) kind = GDB_INDEX_SYMBOL_KIND_FUNCTION; -- 2.34.3