From patchwork Mon Jan 15 11:28:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Carlotti X-Patchwork-Id: 84098 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 CA3D53857B9A for ; Mon, 15 Jan 2024 11:43:19 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2074.outbound.protection.outlook.com [40.107.105.74]) by sourceware.org (Postfix) with ESMTPS id BDBE238582AA for ; Mon, 15 Jan 2024 11:42:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BDBE238582AA Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org BDBE238582AA Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.105.74 ARC-Seal: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1705318966; cv=pass; b=IdqooGp+H3cgy+6PJzXAMJOrr1O81GymcRoX04x/AumhyZ+dfSr2KDxMmqmnpXg/n1tq0T09yHJpbSBdHvCgm39jhYhMbzxU6x73AhCImJUpVobf8QFShg8F+NYPceLzpqSVSKxc/HIpsW3sL8cc3U4lWm3Osll16b8WedDWP14= ARC-Message-Signature: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1705318966; c=relaxed/simple; bh=a9R0oiX1LmGb0TfIDkT2e1yp9agmoSwg4WexRRiJit4=; h=DKIM-Signature:DKIM-Signature:Date:From:To:Subject:Message-ID: MIME-Version; b=j92/vvNLd8CH00DPKbC2e2isizoTBWo58s2Kd0wWlHG+8X49Khn8YtyJXpW9vA7tiDSOkyNYMegDjgKHeEYdy8jtB6T09ozAI7lcuKQ+K0yWU0qKXZzfdgXINzzvqPBc/ZFdkwo/viQOBusUSUxXWopM4Nn91+eaQiQLsRlvlLI= ARC-Authentication-Results: i=3; server2.sourceware.org ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=mkRNHiUou2I+SvQDKk7cGAQdrzmasUagRpXnby9HrLajV4d/MysUO+vsy1bHUbWCJbIVxfcsD2ouY4Xm6G4t/7Rg59MQ5oz3OOImibiJ1PyI9MKpmkhIC2ijlwyBQPXgfeUKUAjdF5GGTZsq5p6Fnsv8l/i0X32n80JhsvcgJz8PNXQMevgvFY/paVUU8FT1mka9f893icETpjtzwouCuPmHPcPUDu328NU0lOHB09RGmLy/0NJW5u+EPKv6LTt1ApeEYtRMBIFRyZjEtaSmx5lR20Ehc8F4yR8iyPv9hBgZDboMdoCfEdYqfzt5Hr75d4ri7fiqIcggFj6jbU5mtA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=RyfrJ2xj469Ln8Hx1eXMOmmEauyFosXGyqBcVVuF5ZE=; b=JCC32x3ehTQLQ1LKd/vfNorViywj9KqBaQfVLNJLbWr9rYPHB10OWkd8g+TbC/hhSMtYIDwKXauGiDHd62C6ptQxqJ4+02UjqvQmI1I9Ov9Fxx0pd8VugTh8sxgHjynTxO6ZnufDD8oYu6KCRClpxgbxZdnjphwV9Rbqu6huoDrnSKwSUvXzuP3UIbwrqP5y7qBk6+YnFu0R9cEsPd6vnRj1miAWhxBmSrUIWgGDCwZpC+EpvFabO2HSnBlkj/5EDnEHGMZMR7vRgXtK2pmc3+stb8L5TcbstYzgyTT4Dkc3ApMMV81c2kSw6wc5BrXJs778zuL4cIo/h7A0G6nU3w== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=gcc.gnu.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dkim=[1,1,header.d=arm.com] dmarc=[1,1,header.from=arm.com]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RyfrJ2xj469Ln8Hx1eXMOmmEauyFosXGyqBcVVuF5ZE=; b=x3AR9YKl6mC0sh+HWVHczW+xND9iO1vVwlsmZLrNaTFrJzYOQoj1eTP4TQxdllZlnFhs0yRCAjLqOPNTwrtFXVW6mdL7GrtbC/hUKn6NMV+wD/OaqllFHNkO0JGMyKsQvg6QsMVRryKOeCjgNMYTLpSoF2YF68H5oDtsBJ5fgWY= Received: from AS9PR06CA0162.eurprd06.prod.outlook.com (2603:10a6:20b:45c::31) by GVXPR08MB10667.eurprd08.prod.outlook.com (2603:10a6:150:15a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.24; Mon, 15 Jan 2024 11:42:39 +0000 Received: from AMS0EPF000001A5.eurprd05.prod.outlook.com (2603:10a6:20b:45c:cafe::88) by AS9PR06CA0162.outlook.office365.com (2603:10a6:20b:45c::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.23 via Frontend Transport; Mon, 15 Jan 2024 11:42:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AMS0EPF000001A5.mail.protection.outlook.com (10.167.16.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.16 via Frontend Transport; Mon, 15 Jan 2024 11:42:39 +0000 Received: ("Tessian outbound c4f080b252bb:v228"); Mon, 15 Jan 2024 11:42:39 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 14e99b01343954a7 X-CR-MTA-TID: 64aa7808 Received: from 754bd4b68301.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id C4926F9E-2115-4C6A-92F1-2473678C8307.1; Mon, 15 Jan 2024 11:28:33 +0000 Received: from EUR02-DB5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 754bd4b68301.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 15 Jan 2024 11:28:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QBM2v2QQETyPLGY5N0phjnugUOiNiIyaNOzLhSRE6WmNB0GhuVz5DSuZ0ba5rTF1EtyL31XzygbGFdWGPxfcmjGRHiTIzzW1JzBapDXh75aTwbZAmmRJ97KBmjkKqZ0XDjkNWsWKYHyv8jgE2xcfeGfSzPjuRf0igSrEk9BsKoYmEE8VIPyogMt8FhRfdzEhAaRfaJ2//0Dwq6H3DbiUQIMXs+ta/dcm/TnH/u2F0qmTpxtbd6KObFaCJHq2tv78sU/kEHNRRbKfzphR2/rI3DFjDMdNe69txwJNtHxtE7SGIqt94cp19EmPjsNX147dAGBDGaZ+DmiYwb5DwQ+VAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=RyfrJ2xj469Ln8Hx1eXMOmmEauyFosXGyqBcVVuF5ZE=; b=JIWxVt1SP1/icwSA4neRqkqnF9yTf1owz+EWv8pZP7EnT+A537w+As17mvZy69Rjn+m6IJSDHCZ4/Ylkx4k4Q3lqaRykdWVtablXTP9OY9VAZtEHq4imm4/Tpxxws0jDe41hDEtS7+eBp45CCrgst5IatQLCqAkqXrPc8b9eLPw+gAcvmO0A2FcGdENHqWZuk1rQJlXlEw2CnQL21h9M2MCqex2AB/IaALNuMG2x/yHJrWVF+b9eKrhSFWSV9atSduy1duPM8EK59lRZtjzggwvxwDAazZ0RLMgEs7llOeqsxy6LtEJlgtFA3T8Cv6kc2vQiZTeVmW3DQ3X9iYLzXw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RyfrJ2xj469Ln8Hx1eXMOmmEauyFosXGyqBcVVuF5ZE=; b=x3AR9YKl6mC0sh+HWVHczW+xND9iO1vVwlsmZLrNaTFrJzYOQoj1eTP4TQxdllZlnFhs0yRCAjLqOPNTwrtFXVW6mdL7GrtbC/hUKn6NMV+wD/OaqllFHNkO0JGMyKsQvg6QsMVRryKOeCjgNMYTLpSoF2YF68H5oDtsBJ5fgWY= Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from AS8PR08MB6678.eurprd08.prod.outlook.com (2603:10a6:20b:398::8) by DBBPR08MB6058.eurprd08.prod.outlook.com (2603:10a6:10:201::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.26; Mon, 15 Jan 2024 11:28:32 +0000 Received: from AS8PR08MB6678.eurprd08.prod.outlook.com ([fe80::a997:a5ad:3e6:44b6]) by AS8PR08MB6678.eurprd08.prod.outlook.com ([fe80::a997:a5ad:3e6:44b6%4]) with mapi id 15.20.7181.022; Mon, 15 Jan 2024 11:28:32 +0000 Date: Mon, 15 Jan 2024 11:28:28 +0000 From: Andrew Carlotti To: gcc-patches@gcc.gnu.org Cc: Richard Biener Subject: [PATCH 4/5] cp: Use get_mangled_id in more places in mangle_decl Message-ID: <8f8d566a-df83-8562-0420-cb01592ad98c@e124511.cambridge.arm.com> References: Content-Disposition: inline In-Reply-To: X-ClientProxiedBy: LO4P123CA0508.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:272::10) To AS8PR08MB6678.eurprd08.prod.outlook.com (2603:10a6:20b:398::8) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: AS8PR08MB6678:EE_|DBBPR08MB6058:EE_|AMS0EPF000001A5:EE_|GVXPR08MB10667:EE_ X-MS-Office365-Filtering-Correlation-Id: 87bb9d5a-62d8-4ae3-cd02-08dc15bf13bd x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: PKE5R5MUBmcvC0g78VMP5yt8CVNzUYnurvkn2jD+uJ8FPvGGFY8BeaV6vCxCufUsVU4g9rsFIlmXz8hh/3IP/cAm8JSEqjtq5/Cy/jOqQSWU9cnsUFV8wmJCFZsUeIzfi8ZLzXYWv8ZrXOUgebTlNwiNM6fj8uh7NOT0nxuxV10NG53EdzNdhxwwn+J/6Idrghc3IzOX1xhqrAtndzUrcH69Ppwht1pP+nUgiDJ3bN6OJZ5ZBN9Y3iFpSTv/IbMOjRKqEpxEGRTE2QGjdGbOM0OgAIdYlc0Gpsgpd5iEErnalk2hD73iUjpP3V1DsjuRNxe6l7bhNGPSva+ZJYcg0dmOwwIIgybD6XVx1vro/daK+QkREe0BCesRv05/b+msqK4n2lwgkrTK7ZOgqrNJ2Qnr62ZYB3vG1hd6+kxsCobEW7kDNSjAxqkZUtk9wrP5LHy+9y/j9nCv1iO41qA/r1v6f+dQti93l5G46Nf/CJg/ol+3YxLQXME5Aa5RVO82T6vi7fooBCqPWYEjmyfaI1kYZfkHdcSPmwAgj5OC8yB5nnb6M1fkiuURP9rVHBIE X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR08MB6678.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376002)(39860400002)(396003)(366004)(136003)(346002)(230922051799003)(1800799012)(64100799003)(186009)(451199024)(31686004)(31696002)(86362001)(41300700001)(38100700002)(2906002)(26005)(6512007)(478600001)(66556008)(6486002)(66946007)(6506007)(8936002)(66476007)(6916009)(316002)(4326008)(6666004)(5660300002)(44832011)(4744005)(8676002); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB6058 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AMS0EPF000001A5.eurprd05.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: e682d927-be31-4325-7b90-08dc15bd1aa0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MYEtPUmVWGFSmmpEeSqTlTy8hfRqZfD0X5x8qXBSweb31S+HXQwEeeYEfyx+uiqWq2Nb/dhY/AZ1En6QzPtdGwzh4vPxls/GOGwdJG4OmG/LxoQO1wTf+7BMzQhLwXIMsQRkvxrCqB0lzzd0U3XskmQ32mv7SipB/5uxgAg+qQnTyfwovvHMUrapzZdfWGHC/lcSb0KjuYJ9upvdS9E+pukdyfXsO9V9wXXtSS5McRI7EQq3C9NTuKkVEB6iw9VG3EEFYcnbeWFOtB2GRepUtdaWuGGmRkUBwDQVkPQww1cyxHQm9qb7texLneYArjkUy93/v1DZa4W0+GPhpBuqc4y/szKhHyytC3BGgi9CSGrAgvgPhZoBI8WsHWbt7T/r0XJ0lbiU7n2AtN4V1l+juHpI2Psu8Zr6UQ0tacDytR9oerbaVlpujh3t/HFsZtWtGJ/5JEGZSC/Ius7LOxxxcUP1Lx+CT9+yZIILJ1LS4MDRwwKa8HTfT4KpsGdKf80SHPIKZ7VZ19WsEzsgVIHGKhrZlCfj5dau56BkfYefB2ocZmPYKxi/Lb1T8ZNeiaPYAXwMSRVuuamu6AyPE1OTjsSlE6wxeHimpFImDyl+4esIRbc+l7HkFOO1MO0o3ABgWmEMawGMaCp0cUrYeMnLN9JClweQM4KE6oVcqpURnfwXYZoIT81keCxmgrkl43yvAoeJlz9VWSa0b2qyTJhxR769lfxK0Ojh6VIdWjWKue0+SZomW4netCsRVKOwaaDN X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(13230031)(4636009)(346002)(136003)(39860400002)(396003)(376002)(230922051799003)(186009)(82310400011)(64100799003)(1800799012)(451199024)(40470700004)(36840700001)(46966006)(31686004)(40460700003)(40480700001)(6506007)(6666004)(6512007)(26005)(107886003)(336012)(36860700001)(31696002)(81166007)(86362001)(356005)(82740400003)(4744005)(8936002)(6486002)(4326008)(44832011)(2906002)(41300700001)(8676002)(47076005)(5660300002)(70206006)(478600001)(316002)(6916009)(70586007); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jan 2024 11:42:39.3285 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 87bb9d5a-62d8-4ae3-cd02-08dc15bf13bd X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AMS0EPF000001A5.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR08MB10667 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_NONE, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org There's no functional change here, but it makes it clearer that all three locations should be doing the same thing (aside from changes to flag_abi_version). gcc/cp/ChangeLog: * mangle.cc (mangle_decl): Consistently use get_mangled_id. diff --git a/gcc/cp/mangle.cc b/gcc/cp/mangle.cc index a04bc584586f28cb80d21b5c6d647416aa8843df..9bd684608b9e3378292cdb042184ba603b3d69aa 100644 --- a/gcc/cp/mangle.cc +++ b/gcc/cp/mangle.cc @@ -4503,8 +4503,7 @@ mangle_decl (const tree decl) return; flag_abi_version = flag_abi_compat_version; - id2 = mangle_decl_string (decl); - id2 = targetm.mangle_decl_assembler_name (decl, id2); + id2 = get_mangled_id (decl); flag_abi_version = save_ver; if (id2 != id) @@ -4519,8 +4518,7 @@ mangle_decl (const tree decl) || id2 == NULL_TREE) { flag_abi_version = warn_abi_version; - id2 = mangle_decl_string (decl); - id2 = targetm.mangle_decl_assembler_name (decl, id2); + id2 = get_mangled_id (decl); } flag_abi_version = save_ver;