From patchwork Fri Sep 15 13:46:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 76131 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 6AA113858C2B for ; Fri, 15 Sep 2023 13:47:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6AA113858C2B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1694785625; bh=LgE8b+nHngv+BPpoyiI5+RayZdHCkQ0akwPhcyF0bMk=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=K/+pAXcd7jmh5AyJFNag+l7HMcuF9WjjJlqZ9bMhzNBKi2ZURsQqKoYcfP7pOBY1u tKo81n0UqevqIWeKdynH6hgXiKVUF3BtB5Q8IJa6nkwBRiNvGepuozBSGjGFZAgGeq kqi9lmjODkKaLupc3Nd2ENr3GtzcYWcBpKfs3jXk= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) by sourceware.org (Postfix) with ESMTPS id 416343858D1E for ; Fri, 15 Sep 2023 13:46:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 416343858D1E Received: by mail-il1-x135.google.com with SMTP id e9e14a558f8ab-34f6d035acaso7360025ab.3 for ; Fri, 15 Sep 2023 06:46:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694785599; x=1695390399; 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=LgE8b+nHngv+BPpoyiI5+RayZdHCkQ0akwPhcyF0bMk=; b=Y8RCSMPvuSsRB9z7i5HBFINKFM1vKQ8zQgdcALLkFfmeAKLCVCNRfMqimy2DCl+l2D kKjKFUMPWZGcXYycx3rhVPpTVs69FoIxNXDzkutpU5+cQp/7GusYTAPTtY+gHXFBjI7g uMnfsnAuQzWACevGTdgS/GucEiKFB8/77KlN2IKEjnp7iVD06fosaR/rTvCnCOX7wV/x 0RoZwVaZYQqAeYLBc2DV3BU54/7BvhCUH3MWelXdk/SkHi+NbWsy2+2vyquATdTYpCoS Q5gj0AQ+veQNdSKWNMijV37SUKddF9W2mADBImXXRBCv5d3ANlluo7rOISMVFnZb7nwI yemw== X-Gm-Message-State: AOJu0Yxsua5a3lNZZEANBXIWnXt0OzDcjeh5Id8D9dORgk3AnHh2b0fv qrij/bYHCH8WsIBT0fW2NBekxkDVKadMrPgP9HD8Qg== X-Google-Smtp-Source: AGHT+IEkF8npNNqK7PWexuGUT6aSwettksaJxm7lIKpgz8jumJycLuj/A1EFMMBkefl/rpdfzZS15Q== X-Received: by 2002:a05:6e02:1248:b0:345:d4da:41d with SMTP id j8-20020a056e02124800b00345d4da041dmr2058267ilq.8.1694785599518; Fri, 15 Sep 2023 06:46:39 -0700 (PDT) Received: from localhost.localdomain (71-211-130-31.hlrn.qwest.net. [71.211.130.31]) by smtp.gmail.com with ESMTPSA id q12-20020a056e02078c00b0034e1acce730sm1131727ils.42.2023.09.15.06.46.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 06:46:39 -0700 (PDT) To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [pushed] Rename split_style::DOT Date: Fri, 15 Sep 2023 07:46:29 -0600 Message-Id: <20230915134629.2129475-1-tromey@adacore.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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.30 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" This renames split_style::DOT, to avoid name clashes when building gdb with an old version of Bison (2.3, the version available on macOS). In particular the error looks like: ./split-name.h:34:3: error: expected identifier DOT, ^ m2-exp.c:163:13: note: expanded from macro 'DOT' Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30286 --- gdb/dwarf2/cooked-index.c | 2 +- gdb/split-name.c | 2 +- gdb/split-name.h | 5 +++-- gdb/symtab.h | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gdb/dwarf2/cooked-index.c b/gdb/dwarf2/cooked-index.c index d6531260c86..58ea541a5c9 100644 --- a/gdb/dwarf2/cooked-index.c +++ b/gdb/dwarf2/cooked-index.c @@ -267,7 +267,7 @@ cooked_index_shard::handle_gnat_encoded_entry (cooked_index_entry *entry, if (canonical.empty ()) return {}; std::vector names = split_name (canonical.c_str (), - split_style::DOT); + split_style::DOT_STYLE); gdb::string_view tail = names.back (); names.pop_back (); diff --git a/gdb/split-name.c b/gdb/split-name.c index a50a6fa4946..0253b3cf675 100644 --- a/gdb/split-name.c +++ b/gdb/split-name.c @@ -58,7 +58,7 @@ split_name (const char *name, split_style style) } break; - case split_style::DOT: + case split_style::DOT_STYLE: /* D and Go-style names. */ for (const char *iter = strchr (name, '.'); iter != nullptr; diff --git a/gdb/split-name.h b/gdb/split-name.h index 47896cc4406..7648cf9b900 100644 --- a/gdb/split-name.h +++ b/gdb/split-name.h @@ -30,8 +30,9 @@ enum class split_style NONE, /* C++ style, with "::" and template parameter intelligence. */ CXX, - /* Split at ".". Used by Ada, Go, D. */ - DOT, + /* Split at ".". Used by Ada, Go, D. This has a funny name to work + around a bug in Bison 2.3, which is used on macOS. */ + DOT_STYLE, /* Split at "__". Used by Ada encoded names. */ UNDERSCORE, }; diff --git a/gdb/symtab.h b/gdb/symtab.h index ca3b1a4a0b6..8f587807ff9 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -305,7 +305,7 @@ class lookup_name_info final break; case language_d: case language_go: - style = split_style::DOT; + style = split_style::DOT_STYLE; break; } return ::split_name (language_lookup_name (lang), style);