From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2134.outbound.protection.outlook.com [40.107.220.134]) by sourceware.org (Postfix) with ESMTPS id B85483854156 for ; Fri, 30 Sep 2022 06:28:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B85483854156 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=microsoft.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=microsoft.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UbEPR/9T/OdK3pN39ucI91YortaoudbQltUvsmgQl1YThWMuyqGL7jdGoK6OGbafz0kqYmLETCl6UGlttj3Hc6Mmm2GgEVgkwwMUQDSS46lb4mny9GzHdEvk0lEnq2/BbqmZF9hnOpon7XuOfMlcFdndj5QiCrZdHVOc53uHHfg8e7DKR7YfOVicFW/XypQkJDY8NVxSs5/E9ppJ7msSVYoo88wP2sbJ7xzR70UrZcg9ohigJRrj+AOSl4vU/qzoJlGZNTXc5aPUs9nRFuAz7oiqZWNIQzKGcJZQ+oel4nFZ6yq2ezeGVQTbHOX9Z3vSttck6gjn+TCzs6kCz1KHXQ== 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=1pFdEGLO/4rsf9npbltqGXkHaT5umMrva2E2rZm2S8g=; b=nG1kdsrVXGcSdNrKbdKfw/xHO1RnJs0+RlmXIfWQIX5aB1FkGTGwYdSsgqUl4VbdXGs4VevCWrSXxqKIWzK9q6dAGlaFJsR7t6Bguo34wCzf9xZGlPRviPjqb0yb+nyZFxyuegV3odiKaLqtVDE1bsoYF5A/9nOCiLtB5YEjZmWpQ/piHsNFgOsVzL5GGWAhNCJ60XeitqC44nR8fcj2Tqtqbf5/m3WomaAQ0wOIE5HgR3dzEj+zPugQjU/T9MijmhISdWuqOyC8BoQp3bVLT8xhnN/Pm80Y4dM8MrZ6xY5K+TOTRhR08CqhHDkNgq6z8BEaIu2xo6TaeOfLM0bIXg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microsoft.com; dmarc=pass action=none header.from=microsoft.com; dkim=pass header.d=microsoft.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1pFdEGLO/4rsf9npbltqGXkHaT5umMrva2E2rZm2S8g=; b=AMXk/UEoEBGMgbz6Gd6GyGWZfJiEXPXS08GagJ8tXxgDXxyPYeA7dl8wibaIXb4yyDdA4RmcAy/EuLwGdpTAB6iN3BGaPEwKEWWBHw33VlKLWVDGUaVp0qzeVwZcSv2gDhq1ZFJy2IpVl0HAw4J1CFrX+ergJkMu1O6sUw09dB8= Received: from CY5PR21MB3542.namprd21.prod.outlook.com (2603:10b6:930:d::7) by MN0PR21MB3750.namprd21.prod.outlook.com (2603:10b6:208:3d0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.0; Fri, 30 Sep 2022 06:28:01 +0000 Received: from CY5PR21MB3542.namprd21.prod.outlook.com ([fe80::38ea:b9c1:41a7:b0ec]) by CY5PR21MB3542.namprd21.prod.outlook.com ([fe80::38ea:b9c1:41a7:b0ec%3]) with mapi id 15.20.5709.001; Fri, 30 Sep 2022 06:28:01 +0000 From: Eugene Rozenfeld To: "gcc-patches@gcc.gnu.org" , Jason Merrill Subject: [PATCH] Emit discriminators for inlined call sites. Thread-Topic: [PATCH] Emit discriminators for inlined call sites. Thread-Index: AdjUZ8+SE5JcTNoxRfKd6mFHMuJ8og== Date: Fri, 30 Sep 2022 06:28:01 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ActionId=f5469789-8939-46e8-a49a-46ff44f48dd3;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ContentBits=0;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Enabled=true;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Method=Standard;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Name=Internal;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate=2022-09-30T00:50:50Z;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47; authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=microsoft.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: CY5PR21MB3542:EE_|MN0PR21MB3750:EE_ x-ms-office365-filtering-correlation-id: 9b552861-6a74-4551-3be6-08daa2acec73 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: c7AgKqTiMVtMVQgINxjMeISSka+E2LXqyC4B2ulsT/+Q6mVWM4Uxtz1GxsZWhobARJSmYVhDoImGs8AD4aaNUzl6HTSlaDB9UDW2TeBL6OYukkTeLXQ9h/h4dwCs+jOtxcYGd2JdAWc8MRWhnwmB23F6Z1lk1OoB2MjiCwapI68rF8MgqFI1CUg4C1t2pNa9pPSpBmGtydjkWiUiSarPwvqk2HyqZOPIlh3Eby3fEw9Bp2y79RG4NOOW3CEiIiGKutV7Iip5i65fFKGCWj+LDLwhT6aIX96Mjl2BVKsSKV2E+4QZl4p/vCT6eSrHZNdQwyLrJeJAhvKS1TQDtVyJN1AabBn7EPWTjt3KM+0QbaaF3YIhE7/3A7WQspBCadbmtKINKZLtLB93OoGNTIvR6KPOgffxKoOHhSb2El96UNMguJOmEQbPm/9vmlEkWGD4lF55WPRUC6encYpZ2Ycw1yP3mM0zu3hYnxqnlMxQFRzk36AEyWEkju3vhLJYLSVEkr+4ELI3rXnjzvWR+HmxmZXmiTaXfl6wME3r/kYLEvIj7CZeOHUUsx7jel3g8TzMjHwHG4O1gLLf9ZpJmFYcyUUiBXE1cHxD2O7kMEIk9B21A+gv7v1ygniZyO/Euasy7QnjQikOq8goucrU0lVpNpdz00AlL2vGuF7bWW/HLwRhBv4vJCgzHjcP7YqF3dMDCrmxx+I80m5FaB7SuUoehR9qT5juZ+f8BWD1ybFFUXUDLPLO9E1c9fgPdfmjIvDJAhcjp3umO2YrNr+GHOCY2Hjn/h+Zh/tGRnjV9+dBfk2QjJwrSVl+0mh4Zhv6XsWy x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CY5PR21MB3542.namprd21.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(346002)(366004)(396003)(376002)(136003)(39860400002)(451199015)(110136005)(66556008)(66946007)(10290500003)(66446008)(55016003)(316002)(8676002)(64756008)(76116006)(66476007)(478600001)(38070700005)(71200400001)(2906002)(83380400001)(122000001)(52536014)(82960400001)(5660300002)(38100700002)(82950400001)(7696005)(6506007)(9686003)(41300700001)(86362001)(8990500004)(8936002)(33656002)(186003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?BnZXehR6BVAbjvwZmny1MFVEiYWMa85TGXF8VY0DCxSvKHhMDRRJHbJIVnAK?= =?us-ascii?Q?KWiTP+0s8diZYMC8Zw8e9Qcx+XuHUgnrXtQh8qW5SBt+VIVn1+EU0vLA++9R?= =?us-ascii?Q?zKJY+sbPKEQS9unL4qBgREO5s4UnDbHxZHgQcrC5WgAMAVfVqbmhSApIpaap?= =?us-ascii?Q?vkfTB2hI/qdxXR7HBgXmnK9c1UBXAGWFL+YfqHIr4RTh1Qb42wjMnMH30vUF?= =?us-ascii?Q?qtl9Yfcfarf4WzfBfAFR7HIgEmG0oYo2KLMtYnwGJr+9hkURhUZvSWfS1xIu?= =?us-ascii?Q?X8yqCmk7OAaNCNsjyBI4x5Y+uvArNWwpvZel6/HAGV/irHVmyRDvOgCpJWsF?= =?us-ascii?Q?3fJaRotYES1cEyeU7PwGsx8vWp7WOPEiJEheHacHXCs2zWMt9urud7JKywPc?= =?us-ascii?Q?Vyh2t/8gHkpjvKo6u/4ke0fRHHKwgV26kVAyt4IY3+lIlXUnlsN8t6MtgIIb?= =?us-ascii?Q?mpI/ooPbBjpbJBMilJzfaGVPhVCGPo/Q80uOSTP9j4UsrqGFriYVV0Ju6vZz?= =?us-ascii?Q?WL39laGrR8krZ8hOHgaNt3Opr+0N0yt5mkZl0AwzhVoSXBxTGPDApU0S7CYK?= =?us-ascii?Q?NsDdHF8EXIQddtUwQOOHvqS73zepw9FqOUNy3qDkgtMyDbY87RkR6YVlI7qb?= =?us-ascii?Q?xlZHDGmRe8eJWydVGcIoEk5kBsEyFsQDMGsxzVyxiQtLyicCUmRwsYf6qN36?= =?us-ascii?Q?HAwRFvrfVXhhAvbz4wBM1GCm5/OYAyUWZDNbEAooFCGPSd0qrPUnZmkSNF4V?= =?us-ascii?Q?9ct5+L4EABlCD/NFoGwRJyT59Rs82Spiy9PQJnPf3SUnBiaQFxxF+evlFHHX?= =?us-ascii?Q?gs18ntBxp8X3WDuoLQWBDUeCD7uqjxPwau5V7l5H9vhJMb2xbTOQ9kKxP4Zf?= =?us-ascii?Q?lzEeBPOvxLlacX+QuaTKqm+VxgclLXW2GPc0IA2WskC1fvbbN5jnre121o4P?= =?us-ascii?Q?iC+XEzLnMRgOA0W8ZKf9erk1KaYrZGfj14p2hpWGoSMu7ifSbZaUXhyPZPT9?= =?us-ascii?Q?0gcWK6scxMYToD2W5I2bnlCJkoaQmQNR56H1DM9esT9REBUuUIY7D0I/yD6M?= =?us-ascii?Q?d8n0in4q4FodRb0Nid6ZHFlDc9HGeC+vxOrEXfwAvhPhCIlvZihvWrxtzarB?= =?us-ascii?Q?nSJgfYbrA512igZYDy80uqGAiIrP1xH7o+KfIl663JnnHLmyicxx4wuLYQcw?= =?us-ascii?Q?jCf6Ph8VBcJCYynjestLV52h1FizhmUHG7LlR0R9LDnJ8/j2fKc/dX+VM7nF?= =?us-ascii?Q?MU2cyGbzrRpHonF+MMXTogVcEh+D+vhDj2u6F0ZDqyOSnQtNdBwrQFbfC0Tc?= =?us-ascii?Q?JlLk0Q+MOXhgGMgzjuKxml+P+MbwAOF1w0c27uaVq/G6+GuwDuvgr9rmoqWb?= =?us-ascii?Q?AnOL3pL3kJuNlACDFBgw3oyrkOZm8y8MxlZyxAWLaO+zZkem7aF/vWSgyy98?= =?us-ascii?Q?8D54uZHCoUYnmM8Ztz/vyKsnoUt6X0RANW8tVIsB5IDBFGAKKiDQI9MKwPod?= =?us-ascii?Q?qiLLt3U2zv4YewMlmHZ0CCDN67TbXZZwAfBzwntA+u1uA5ba4ciee8KkKd0x?= =?us-ascii?Q?YCWa4j8DhM/CXld+vUceb2fCXO3ucwi4qUXpDKKGsF5rUaWUGB70kt8KaV7b?= =?us-ascii?Q?c+O50pChuyE0c56kc8wf5HHMXfoOhum+uH2OT4rKHKpF?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CY5PR21MB3542.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9b552861-6a74-4551-3be6-08daa2acec73 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Sep 2022 06:28:01.0927 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Ly4y9YrNzAvpwBHaI65bTbMlYPjmNrbk6kQd6xlA5CM2DiZJc8OzReiZ5Hjg4Ri6iv/GCGJDkHTIYbdzqYCKwg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR21MB3750 X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,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 List-Id: This change is based on commit 9fa26998a63d4b22b637ed8702520819e408a694 by Dehao Chen in vendors/google/heads/gcc-4_8. gcc/ChangeLog: * dwarf2out.cc (add_call_src_coords_attributes): Emit discriminator= s for inlined call sites. --- gcc/dwarf2out.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gcc/dwarf2out.cc b/gcc/dwarf2out.cc index 2df75904022..e81044b8c48 100644 --- a/gcc/dwarf2out.cc +++ b/gcc/dwarf2out.cc @@ -24783,7 +24783,8 @@ add_call_src_coords_attributes (tree stmt, dw_die_r= ef die) if (RESERVED_LOCATION_P (BLOCK_SOURCE_LOCATION (stmt))) return; - expanded_location s =3D expand_location (BLOCK_SOURCE_LOCATION (stmt)); + location_t locus =3D BLOCK_SOURCE_LOCATION (stmt); + expanded_location s =3D expand_location (locus); if (dwarf_version >=3D 3 || !dwarf_strict) { @@ -24791,6 +24792,9 @@ add_call_src_coords_attributes (tree stmt, dw_die_r= ef die) add_AT_unsigned (die, DW_AT_call_line, s.line); if (debug_column_info && s.column) add_AT_unsigned (die, DW_AT_call_column, s.column); + unsigned discr =3D get_discriminator_from_loc (locus); + if (discr !=3D 0) + add_AT_unsigned (die, DW_AT_GNU_discriminator, discr); } } -- 2.25.1