From patchwork Sun Apr 21 17:00:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 88820 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 F28913858C3A for ; Sun, 21 Apr 2024 17:01:58 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta40.uswest2.a.cloudfilter.net (omta40.uswest2.a.cloudfilter.net [35.89.44.39]) by sourceware.org (Postfix) with ESMTPS id 932AA3858C56 for ; Sun, 21 Apr 2024 17:00:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 932AA3858C56 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 932AA3858C56 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713718812; cv=none; b=QNvwc8aT/mD6vf0S90m1jdV78lHh1TIPSakLrT7AYwZ6HsqLDbPLqmc5ZmmmeiwFml61ljOyvQoiKXJGMgnBePFXEeaNc3sV9JZSCZ5IdiYOVTXvJBfxIw4jEBi6GBw9D+Wgr8pX/UvV+U8fQkEQ3R40Gd05pKtDHZt5GcGP1j8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713718812; c=relaxed/simple; bh=UTEK0aixAq/OHKiNaH5l0VC/zRNR65kORWH3Tj98q2o=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=mc5fK7J9unV5Eb++nZqzjjA2Gc4ngEVAxj2ybBOkKmMS3jNTYmb6JELI6msdm349MbDE2Roa/OXeqFUIizb9NTw5JaEpy70A8g2TwEKK/3P1GWYbO2pdlkzcC/AGdmn6Knhir64P2fxnKQho3x3Ipx5ZI9cd4UmHboTGw05rfnY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6003a.ext.cloudfilter.net ([10.0.30.151]) by cmsmtp with ESMTPS id yUN2rzzgZPM1hyaXtr0baU; Sun, 21 Apr 2024 17:00:05 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id yaXsrnKBQd4oeyaXtrpkM5; Sun, 21 Apr 2024 17:00:05 +0000 X-Authority-Analysis: v=2.4 cv=aYKqngot c=1 sm=1 tr=0 ts=66254615 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=raytVjVEu-sA:10 a=Qbun_eYptAEA:10 a=CCpqsmhAAAAA:8 a=EHerL0z3gyhmtD2HClQA:9 a=QEXdDO2ut3YA:10 a=ul9cdbp4aOFLsgKbc677:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=x5CN1wXjZlb8zQnmVgh2gvQdFuK+sir0E1ObzI0HUmo=; b=YzVcRMJZqPDqVlvIwa2YqQ7S80 AizCEdkqGXc4UbesjYLxZGmFiPA+R7Knz+4GmjdndaqDH47L19dLVXF2KmGIGpWJvj5Hz2jbZgbj9 SCa6kEikoxvU9IarkBgKJamx3; Received: from 97-122-86-252.hlrn.qwest.net ([97.122.86.252]:53968 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1ryaXs-003wVC-1R for gdb-patches@sourceware.org; Sun, 21 Apr 2024 11:00:04 -0600 From: Tom Tromey Date: Sun, 21 Apr 2024 11:00:09 -0600 Subject: [PATCH 09/10] Allow function types as template parameters in name canonicalizer MIME-Version: 1.0 Message-Id: <20240421-canon-fixes-v1-9-4dc4791d270d@tromey.com> References: <20240421-canon-fixes-v1-0-4dc4791d270d@tromey.com> In-Reply-To: <20240421-canon-fixes-v1-0-4dc4791d270d@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.13.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.86.252 X-Source-L: No X-Exim-ID: 1ryaXs-003wVC-1R X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-86-252.hlrn.qwest.net ([192.168.0.21]) [97.122.86.252]:53968 X-Source-Auth: tom+tromey.com X-Email-Count: 10 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfEHCU+vHMZ4Mt4alwu5jPQ88frsVZ3Nd4/wV7e03xJKT1RqKcNpJlaNFUNABandAT8I3MBSgJIzLupKGNUp0439XRdkQ0lSjG04qskRjzIisax1PdeF0 z24vRpz2pGPEQ7Id6deAuebiyvld/Wo0GOWJtJnLQ12IQ5s++sW40SjVsyodGXmlXW7HSctH2ED1rMK6948K8fSIl8NF3+KDv08= X-Spam-Status: No, score=-3021.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, 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: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org This adds function types as template parameters in the C++ name canonicalizer. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=11907 --- gdb/cp-name-parser.y | 4 ++++ gdb/cp-support.c | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/gdb/cp-name-parser.y b/gdb/cp-name-parser.y index 3c5dea2de1c..e820faa2db9 100644 --- a/gdb/cp-name-parser.y +++ b/gdb/cp-name-parser.y @@ -596,6 +596,7 @@ template_arg : typespec_2 | '&' '(' start ')' { $$ = state->fill_comp (DEMANGLE_COMPONENT_UNARY, state->make_operator ("&", 1), $3); } | exp + | function ; function_args : typespec_2 @@ -2066,6 +2067,9 @@ canonicalize_tests () should_be_the_same ("x::y::z<0b111>", "x::y::z<0D7>"); should_be_the_same ("x::y::z<0xff'ff>", "x::y::z<65535>"); + + should_be_the_same ("something", "something< void() >"); + should_be_the_same ("something", "something"); } #endif diff --git a/gdb/cp-support.c b/gdb/cp-support.c index 4c64e4963e4..74a1b61ed68 100644 --- a/gdb/cp-support.c +++ b/gdb/cp-support.c @@ -2186,15 +2186,8 @@ test_cp_remove_params () CHECK_INCOMPL ("A::foo<(anonymous namespace)::B", "A::foo"); - /* Shouldn't this parse? Looks like a bug in - cp_demangled_name_to_comp. See PR c++/22411. */ -#if 0 CHECK ("A::foo::func(int)", "A::foo::func"); -#else - CHECK_INCOMPL ("A::foo::func(int)", - "A::foo"); -#endif CHECK_INCOMPL ("A::foo