From patchwork Wed Oct 13 16:04:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Lu=C3=ADs_Ferreira?= X-Patchwork-Id: 46178 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 72376385782A for ; Wed, 13 Oct 2021 16:05:22 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from 10.mo576.mail-out.ovh.net (10.mo576.mail-out.ovh.net [46.105.73.241]) by sourceware.org (Postfix) with ESMTPS id DBDA53858015 for ; Wed, 13 Oct 2021 16:04:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DBDA53858015 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=lsferreira.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=lsferreira.net Received: from player715.ha.ovh.net (unknown [10.108.1.191]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id B81F921EFB for ; Wed, 13 Oct 2021 16:04:53 +0000 (UTC) Received: from lsferreira.net (252.131.62.94.rev.vodafone.pt [94.62.131.252]) (Authenticated sender: contact@lsferreira.net) by player715.ha.ovh.net (Postfix) with ESMTPSA id 0E7F723046285; Wed, 13 Oct 2021 16:04:51 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-104R00569881df2-820d-4473-92a8-4a5d933e4aec, A8D098B9B29251AE790F9592EC533D14122901BA) smtp.auth=contact@lsferreira.net X-OVh-ClientIp: 94.62.131.252 From: =?utf-8?q?Lu=C3=ADs_Ferreira?= To: gcc-patches@gcc.gnu.org Subject: [PATCH v2] libiberty: d-demangle: use distinguishable tuple() Date: Wed, 13 Oct 2021 17:04:48 +0100 Message-Id: <20211013160448.183605-1-contact@lsferreira.net> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 262616157276862712 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvtddrvddutddgleegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvffufffkofggtgfgsehtkeertdertdejnecuhfhrohhmpefnuhovshcuhfgvrhhrvghirhgruceotghonhhtrggttheslhhsfhgvrhhrvghirhgrrdhnvghtqeenucggtffrrghtthgvrhhnpeelvddvtddtffdukeffffejtdfgkeegudelhfehveeuudejueegjeduueefgedukeenucfkpheptddrtddrtddrtddpleegrdeivddrudefuddrvdehvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphdqohhuthdphhgvlhhopehplhgrhigvrhejudehrdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomheptghonhhtrggttheslhhsfhgvrhhrvghirhgrrdhnvghtpdhrtghpthhtohepghgttgdqphgrthgthhgvshesghgttgdrghhnuhdrohhrgh X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Lu=C3=ADs_Ferreira?= Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Since Tuple!() is templated type from standard library, this can make two demangled names undistinguishable. Signed-off-by: Luís Ferreira libiberty/ChangeLog: * d-demangle.c (dlang_parse_tuple): use tuple() instead of Tuple!() * testsuite/d-demangle-expected: rename the tests to use tuple() instead of Tuple!(). --- libiberty/d-demangle.c | 2 +- libiberty/testsuite/d-demangle-expected | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libiberty/d-demangle.c b/libiberty/d-demangle.c index 880f2ec85a4..5dbdc36adbe 100644 --- a/libiberty/d-demangle.c +++ b/libiberty/d-demangle.c @@ -1711,7 +1711,7 @@ dlang_parse_tuple (string *decl, const char *mangled, struct dlang_info *info) if (mangled == NULL) return NULL; - string_append (decl, "Tuple!("); + string_append (decl, "tuple("); while (elements--) { diff --git a/libiberty/testsuite/d-demangle-expected b/libiberty/testsuite/d-demangle-expected index 44a3649c429..98044ad23c5 100644 --- a/libiberty/testsuite/d-demangle-expected +++ b/libiberty/testsuite/d-demangle-expected @@ -367,27 +367,27 @@ demangle.test(char, char) # --format=dlang _D8demangle4testFB0Zv -demangle.test(Tuple!()) +demangle.test(tuple()) # --format=dlang _D8demangle4testFB1aZv -demangle.test(Tuple!(char)) +demangle.test(tuple(char)) # --format=dlang _D8demangle4testFB2aaZv -demangle.test(Tuple!(char, char)) +demangle.test(tuple(char, char)) # --format=dlang _D8demangle4testFB3aaaZv -demangle.test(Tuple!(char, char, char)) +demangle.test(tuple(char, char, char)) # --format=dlang _D8demangle4testFB2OaaZv -demangle.test(Tuple!(shared(char), char)) +demangle.test(tuple(shared(char), char)) # --format=dlang _D8demangle4testFB3aDFZaaZv -demangle.test(Tuple!(char, char() delegate, char)) +demangle.test(tuple(char, char() delegate, char)) # --format=dlang _D8demangle4testFDFZaZv