From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 56168 invoked by alias); 3 Oct 2019 15:18:45 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 56101 invoked by uid 89); 3 Oct 2019 15:18:44 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-9.8 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.1 spammy=H*c:HHH X-HELO: EUR03-DB5-obe.outbound.protection.outlook.com Received: from mail-oln040092071037.outbound.protection.outlook.com (HELO EUR03-DB5-obe.outbound.protection.outlook.com) (40.92.71.37) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 03 Oct 2019 15:18:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CGZimQBebJ9EPGb/KnjeXhGuvE+1j1cyRYeZwvnzglLNLW14mcEXRy7/t3xLGyZZmCWdQjmjH59bUDgda1DntcXbixVo7Z/blAnXF3IyGM4aKP0DGn6w5xNjWGvem3cgUM/p9N8F9TEdYTS890aVp6Zkv7MUKDFT46xmhUQ9jKMZoxHpReht+bbz+y4XOZb2sDN4Ocba0QLE8/3OtZ3D24vVdcYavIjwJdSQW24p6oKGppHjMs5rtfRibkRaXTpay9v1ru2tuGfclbX+wBycj9RyI4G3VYerafgD5p2uMbcC2QyCQYxdNLA5Hm78ywvMBSkCfmFFQbuPb9RjvQ1pHQ== 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-SenderADCheck; bh=LgDDy4Y7wnszbu052SkdTFLkbl1QJKrOBNWL637uou0=; b=GmNU70MXRAo0NlOyO1n2r1dSPK40jQHtvdSAINzvY2xAnlgS+R+WYh2bwtagsf1y8gaTJv7iWEhaLTmL0PtFy63sK8V1nw57ufOQa0LEdM82L/Cry4z1Vyx/MCrHaM/vW1r97BmEp15cGToJyfyfTkQqMadwFG7X3OKcluZ6D7oGwj1n/MyhdgAoMraxACrh8ibQ5d48PjAnBFPzbK2jBsTUWoMhVxPqqrGwLSOTeY3MK05U8GvxwLrM6knjWYeledKc+bVaNPIba+e3JJtaFSPPLuePWiijy0XUJm35DVw1JqSpFQEjrwdFPo39zEypXx3h6t2S+encz5W4WkWbsA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from AM5EUR03FT057.eop-EUR03.prod.protection.outlook.com (10.152.16.58) by AM5EUR03HT020.eop-EUR03.prod.protection.outlook.com (10.152.16.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2305.15; Thu, 3 Oct 2019 15:18:40 +0000 Received: from VI1PR03MB4528.eurprd03.prod.outlook.com (10.152.16.58) by AM5EUR03FT057.mail.protection.outlook.com (10.152.17.44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2305.15 via Frontend Transport; Thu, 3 Oct 2019 15:18:40 +0000 Received: from VI1PR03MB4528.eurprd03.prod.outlook.com ([fe80::1917:2b45:72b0:548a]) by VI1PR03MB4528.eurprd03.prod.outlook.com ([fe80::1917:2b45:72b0:548a%7]) with mapi id 15.20.2305.023; Thu, 3 Oct 2019 15:18:40 +0000 From: Bernd Edlinger To: "gcc-patches@gcc.gnu.org" Subject: [PATCH] Fix -Wshadow=local warnings in dumpfile.h Date: Thu, 03 Oct 2019 15:18:00 -0000 Message-ID: x-microsoft-original-message-id: <709efa42-63f0-4def-086e-e1929b75452e@hotmail.de> x-ms-exchange-transport-forked: True Content-Type: multipart/mixed; boundary="_002_VI1PR03MB4528A51B7A77C6EA3CFC8C54E49F0VI1PR03MB4528eurp_" MIME-Version: 1.0 X-SW-Source: 2019-10/txt/msg00223.txt.bz2 --_002_VI1PR03MB4528A51B7A77C6EA3CFC8C54E49F0VI1PR03MB4528eurp_ Content-Type: text/plain; charset="Windows-1252" Content-ID: <2C86A7B180C4AC47BBF95C3E8ACA272A@eurprd03.prod.outlook.com> Content-Transfer-Encoding: quoted-printable Content-length: 375 Hi, this fixes a -Wshadow=3Dlocal warning when using AUTO_DUMP_SCOPE in nested blocks. Since NAME i a string I cannot use it to create a unique name for the auto_dump_scope object. So I used XCONCAT2 from good old symcat.h, to mangle the __LINE__ macro into the scope object name. Bootstrapped and reg-tested on x86_64-pc-linux-gnu. Is it OK for trunk? Thanks Bernd. --_002_VI1PR03MB4528A51B7A77C6EA3CFC8C54E49F0VI1PR03MB4528eurp_ Content-Type: text/x-patch; name="patch-wshadow-dumpfile.diff" Content-Description: patch-wshadow-dumpfile.diff Content-Disposition: attachment; filename="patch-wshadow-dumpfile.diff"; size=945; creation-date="Thu, 03 Oct 2019 15:18:40 GMT"; modification-date="Thu, 03 Oct 2019 15:18:40 GMT" Content-ID: <24554DB8023F764395B2B892E0D59D47@eurprd03.prod.outlook.com> Content-Transfer-Encoding: base64 Content-length: 1281 MjAxOS0xMC0wMyAgQmVybmQgRWRsaW5nZXIgIDxiZXJuZC5lZGxpbmdlckBo b3RtYWlsLmRlPgoKCSogZHVtcGZpbGUuaCAoQVVUT19EVU1QX1NDT1BFKTog VXNlIFhDT05DQVQyIGFuZCBfX0xJTkVfXwoJdG8gZm9ybSBhIHVuaXF1ZSBu YW1lIGZvciB0aGUgc2NvcGUgdmFyaWFibGUuCgpJbmRleDogZ2NjL2R1bXBm aWxlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gZ2NjL2R1bXBmaWxl LmgJKHJldmlzaW9uIDI3NjQ4NCkKKysrIGdjYy9kdW1wZmlsZS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0yMSw2ICsyMSw3IEBAIGFsb25nIHdpdGggR0NDOyBz ZWUgdGhlIGZpbGUgQ09QWUlORzMuICBJZiBub3Qgc2VlCiAjaWZuZGVmIEdD Q19EVU1QRklMRV9ICiAjZGVmaW5lIEdDQ19EVU1QRklMRV9IIDEKIAorI2lu Y2x1ZGUgInN5bWNhdC5oIiAvKiBYQ09OQ0FUMiAqLwogI2luY2x1ZGUgInBy b2ZpbGUtY291bnQuaCIKIAogLyogQW4gYXR0cmlidXRlIGZvciBhbm5vdGF0 aW5nIGZvcm1hdHRpbmcgcHJpbnRpbmcgZnVuY3Rpb25zIHRoYXQgdXNlCkBA IC02MzQsNyArNjM1LDcgQEAgY2xhc3MgYXV0b19kdW1wX3Njb3BlCiAgICBp biBhIG5lc3RlZCBzY29wZSBpbXBsaWNpdGx5IGRlZmF1bHQgdG8gTVNHX1BS SU9SSVRZX0lOVEVSTkFMUy4gICovCiAKICNkZWZpbmUgQVVUT19EVU1QX1ND T1BFKE5BTUUsIFVTRVJfTE9DKSBcCi0gIGF1dG9fZHVtcF9zY29wZSBzY29w ZSAoTkFNRSwgVVNFUl9MT0MpCisgIGF1dG9fZHVtcF9zY29wZSBYQ09OQ0FU MiAoc2NvcGUsIF9fTElORV9fKSAoTkFNRSwgVVNFUl9MT0MpCiAKIGV4dGVy biB2b2lkIGR1bXBfZnVuY3Rpb24gKGludCBwaGFzZSwgdHJlZSBmbik7CiBl eHRlcm4gdm9pZCBwcmludF9jb21iaW5lX3RvdGFsX3N0YXRzICh2b2lkKTsK --_002_VI1PR03MB4528A51B7A77C6EA3CFC8C54E49F0VI1PR03MB4528eurp_--