From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from omta034.useast.a.cloudfilter.net (omta034.useast.a.cloudfilter.net [44.202.169.33]) by sourceware.org (Postfix) with ESMTPS id 8526B3858C53 for ; Sun, 21 Apr 2024 17:00:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8526B3858C53 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 8526B3858C53 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.33 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713718811; cv=none; b=EE89TB3T7eL0LiFhuO5wIjHKwzMcwNthzQhvOG8gbqqOpw8hYfE/vWKc6J2AO8CV5C/H9xY3FK4eqxV25IVPEpQqQSKab0oxN0dZW23sPd7vwOdXA3Shc9S/wPY6sJJv6EDl0jCnXGo5aTv3eGN6JLeclaR34p4CFJ6tqkYbzLM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713718811; c=relaxed/simple; bh=+UheuAoeJtkmX4q5NKUclXy2R9heWSXS06SnbeQ7sjw=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=B6XfUQlDlgYiIJAsVVApJCyBRFJWMXGiOdYIoQ/7A80GrbKFO22j50GHI6lXUYfZXrB4k2llAdxMH17gc0+6BfAjq42svNnntP4CZSQf/gq3Kp8IwYasKvpwgED3pWRnEmdQEonPz31nQhvSQbvhVhclEWdJbg/jWvnypcgP17w= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6006a.ext.cloudfilter.net ([10.0.30.182]) by cmsmtp with ESMTPS id yZz2rrevms4yTyaXurHKIK; Sun, 21 Apr 2024 17:00:06 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id yaXsrcdpSEKylyaXtrXLtB; Sun, 21 Apr 2024 17:00:05 +0000 X-Authority-Analysis: v=2.4 cv=Bombw5X5 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=YEDQgCsy9Zrd67yb2cgA:9 a=QEXdDO2ut3YA:10 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=swTBnrlfGmRK/YCeDp5nlv9W1jedLbId3MI4cle2DDQ=; b=vOz7W46EfcTFZwW6USicpLoxmh 19MNgZNNsr3dUvLsVPgTqJnCO5uoXVy1pzI8Lc36UzdAYwRrj38/UdWEkD7259j1Q402ueZIyFYbd jienMuUgHkuvQwTVCAZS2e7UU; 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-24 for gdb-patches@sourceware.org; Sun, 21 Apr 2024 11:00:04 -0600 From: Tom Tromey Date: Sun, 21 Apr 2024 11:00:10 -0600 Subject: [PATCH 10/10] Add spaceship operator to cp-name-parser.y MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240421-canon-fixes-v1-10-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-24 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: 11 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfECW/i03yv0hIhQgX7Lwfx7QGg4VEtXrZwlL7ys74utawQFuamATVpfZFLCTHHodfK03XqFrKzjc2q+JQ0QP7L71FQjOaaYyzTYVGuehjeZcnjOZIp4C MlqnmdjaUg17souB4bqudj6ORSm3nvCbdwenit3lK9o+Uf+sJnc4SVEtTQrr9vlrLioFLGVplw172819sjYyAAKFF+BpBb0393s= X-Spam-Status: No, score=-3021.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,JMQ_SPF_NEUTRAL,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,TXREP,T_FILL_THIS_FORM_SHORT autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: While debugging gdb, I saw this: During symbol reading: unexpected demangled name 'operator<=>, std::chrono::duration >' This happens because cp-name-parser.y does not handle the spaceship operator. This patch implements this. --- gdb/cp-name-parser.y | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/gdb/cp-name-parser.y b/gdb/cp-name-parser.y index e820faa2db9..db5c349d212 100644 --- a/gdb/cp-name-parser.y +++ b/gdb/cp-name-parser.y @@ -297,7 +297,7 @@ static void yyerror (cpname_state *, const char *); %left '^' %left '&' %left EQUAL NOTEQUAL -%left '<' '>' LEQ GEQ +%left '<' '>' LEQ GEQ SPACESHIP %left LSH RSH %left '@' %left '+' '-' @@ -451,6 +451,8 @@ oper : OPERATOR NEW { $$ = state->make_operator ("<=", 2); } | OPERATOR GEQ { $$ = state->make_operator (">=", 2); } + | OPERATOR SPACESHIP + { $$ = state->make_operator ("<=>", 2); } | OPERATOR ANDAND { $$ = state->make_operator ("&&", 2); } | OPERATOR OROR @@ -1077,6 +1079,10 @@ exp : exp GEQ exp { $$ = state->d_binary (">=", $1, $3); } ; +exp : exp SPACESHIP exp + { $$ = state->d_binary ("<=>", $1, $3); } + ; + exp : exp '<' exp { $$ = state->d_binary ("<", $1, $3); } ; @@ -1783,6 +1789,7 @@ yylex (YYSTYPE *lvalp, cpname_state *state) return c; case '<': HANDLE_TOKEN3 ("<<=", ASSIGN_MODIFY); + HANDLE_TOKEN3 ("<=>", SPACESHIP); HANDLE_TOKEN2 ("<=", LEQ); HANDLE_TOKEN2 ("<<", LSH); state->lexptr++; @@ -2052,6 +2059,14 @@ should_be_the_same (const char *one, const char *two) SELF_CHECK (strcmp (one, two) == 0); } +static void +should_parse (const char *name) +{ + std::string err; + auto parsed = cp_demangled_name_to_comp (name, &err); + SELF_CHECK (parsed != nullptr); +} + static void canonicalize_tests () { @@ -2070,6 +2085,8 @@ canonicalize_tests () should_be_the_same ("something", "something< void() >"); should_be_the_same ("something", "something"); + + should_parse ("void whatever::operator<=>"); } #endif -- 2.44.0