From patchwork Thu Oct 3 15:17:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Edlinger X-Patchwork-Id: 1171244 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-510148-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=hotmail.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="xc7MFgax"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46kc8C2n8mz9sCJ for ; Fri, 4 Oct 2019 01:18:03 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:content-type:mime-version; q=dns; s= default; b=E8lf9ax20/uMctwNwXh0DOvCGAKIybec27X2Nn+WbO5NZvunLtQHX RrEoXxIbLGC7adjhw4+ag5/sNxvGI/tFENPgvrTPPTUiVqThnqY5p616ptuIJII9 Kikbizp6bnTNvfktDj3TE6DHIJTIqOdj1TE6UtxzP8XBwIb9JHh9zY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:content-type:mime-version; s= default; bh=h4pJGUZaY1uGCEkvyJCci8AxSXY=; b=xc7MFgaxv3fcYOYWXged eq0tIRbvrgPOeAbwOjNOSrcJw7MEt9DRTzU10TuDsz7kZKsDSLZcVb1//8x3Z0FH RX1S756CW7F7Y16wV4iniL946t4XilOCmWqqq073hm+nUCee5tHyInGTmNy2aqKu 8U+rW6oGZmLXwTiIicmYxT4= Received: (qmail 46669 invoked by alias); 3 Oct 2019 15:17:54 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 46604 invoked by uid 89); 3 Oct 2019 15:17:53 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-9.7 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=HX-Languages-Length:6227, H*c:HHH X-HELO: EUR01-HE1-obe.outbound.protection.outlook.com Received: from mail-oln040092065069.outbound.protection.outlook.com (HELO EUR01-HE1-obe.outbound.protection.outlook.com) (40.92.65.69) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 03 Oct 2019 15:17:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XlTzd5wD1/aklHegQdwsFAgri+hDT5D9bCTBigaFfKRwyXuf0krZVZSc07tZWq48i1nlN6xzPdxxF9XonoZGmeSGOwcbz2Nh5vSLmxF6boGIIwFV8l5FWeJslB6Q67RCiQuhwW6DdHKNIFrfIv2nCf2FGqINaaUW8w4HZcjhLzqMh0xjl0FWIJlhHU0Ff1dYKgZSiPNCXhBVenlCS1J0qcjv32PQefoEGtzxAZBN0Hx7zTdMNyynEwfMtEpVPfjO2x248RmvLwYUdRLkGG/LKr1qG/7MZiKJi7tRIgz6OxKhel4N6D/ZOhIVmbpUoi9IDnWRo3cWlCq7gJQbk8IXEQ== 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=nGIVbxFnZPj/Ipj5rBTXaB2+zDh/7/QSGKZIBG1A2e8=; b=dLstxl7PQHWtiwyminL1ffKxnBfQPWz9z3dIHMh1dnKGKaqYWEnqYCzJX/0/zh3PC/NXbISx096IoHVAsuJrNWO+aq1uu2TsVK+wOwfRxhDmq4qRfG9wyMJ0828Oha8eZQJuOx0lUupBy56qno1FTvwpTSwjXbnkI48ZhBN0z9FHcQJ39F67vTk1MeLp2J0A9AIS9MKESm+SU754gtbUL75jH3sLUkm7LpFrtgNdLhB1YpKx4DczyV3wKFacSnfhfZ9KFe2DWySqsjLsmy3O5HQqQXSDU86RrTls/W5Vgr03j74WEEt2lVJSJwl61UyAVotDPwoEdeRha/j3SFQj1w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from VE1EUR01FT036.eop-EUR01.prod.protection.outlook.com (10.152.2.57) by VE1EUR01HT101.eop-EUR01.prod.protection.outlook.com (10.152.3.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2327.20; Thu, 3 Oct 2019 15:17:47 +0000 Received: from VI1PR03MB4528.eurprd03.prod.outlook.com (10.152.2.52) by VE1EUR01FT036.mail.protection.outlook.com (10.152.3.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2327.20 via Frontend Transport; Thu, 3 Oct 2019 15:17:47 +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:17:47 +0000 From: Bernd Edlinger To: "gcc-patches@gcc.gnu.org" Subject: [PATCH] Fix -Wshadow=local warnings in rtl.h Date: Thu, 3 Oct 2019 15:17:47 +0000 Message-ID: x-microsoft-original-message-id: <391d5add-cf7b-4015-36d7-984ff82afed7@hotmail.de> x-ms-exchange-transport-forked: True MIME-Version: 1.0 Hi, this fixes -Wshadow=local warnings in the RTL_FLAG_CHECKx macros, which happen when this macro is used recursively in a macro argument. The __typeof (RTX) const _rtx in the inner macro expansions shadows the outer macro expansions. So reworked the macro to not use statement expressions but use templates instead. Since the 7-argument overload is not used anywhere removed RTL_FLAG_CHECK7 for now. Bootstrapped and reg-tested on x86_64-pc-linux-gnu. Is it OK for trunk? Thanks Bernd. 2019-10-03 Bernd Edlinger * rtl.h (RTL_FLAG_CHECK): New variadic macro. (RTL_FLAG_CHECK1-6): Use RTL_FLAG_CHECK. (RTL_FLAG_CHECK7): Remove. (rtl_flag_check, check_rtl_code): New helper functions. Index: gcc/rtl.h =================================================================== --- gcc/rtl.h (revision 276484) +++ gcc/rtl.h (working copy) @@ -1249,66 +1249,18 @@ extern void rtvec_check_failed_bounds (const_rtvec #define RTX_FLAG(RTX, FLAG) ((RTX)->FLAG) #if defined ENABLE_RTL_FLAG_CHECKING && (GCC_VERSION >= 2007) -#define RTL_FLAG_CHECK1(NAME, RTX, C1) __extension__ \ -({ __typeof (RTX) const _rtx = (RTX); \ - if (GET_CODE (_rtx) != C1) \ - rtl_check_failed_flag (NAME, _rtx, __FILE__, __LINE__, \ - __FUNCTION__); \ - _rtx; }) +#define RTL_FLAG_CHECK(NAME, RTX, ...) \ + ((__typeof (&*(RTX))) rtl_flag_check (check_rtl_code<__VA_ARGS__>, \ + NAME, RTX, __FILE__, __LINE__, \ + __FUNCTION__)) -#define RTL_FLAG_CHECK2(NAME, RTX, C1, C2) __extension__ \ -({ __typeof (RTX) const _rtx = (RTX); \ - if (GET_CODE (_rtx) != C1 && GET_CODE(_rtx) != C2) \ - rtl_check_failed_flag (NAME,_rtx, __FILE__, __LINE__, \ - __FUNCTION__); \ - _rtx; }) +#define RTL_FLAG_CHECK1 RTL_FLAG_CHECK +#define RTL_FLAG_CHECK2 RTL_FLAG_CHECK +#define RTL_FLAG_CHECK3 RTL_FLAG_CHECK +#define RTL_FLAG_CHECK4 RTL_FLAG_CHECK +#define RTL_FLAG_CHECK5 RTL_FLAG_CHECK +#define RTL_FLAG_CHECK6 RTL_FLAG_CHECK -#define RTL_FLAG_CHECK3(NAME, RTX, C1, C2, C3) __extension__ \ -({ __typeof (RTX) const _rtx = (RTX); \ - if (GET_CODE (_rtx) != C1 && GET_CODE(_rtx) != C2 \ - && GET_CODE (_rtx) != C3) \ - rtl_check_failed_flag (NAME, _rtx, __FILE__, __LINE__, \ - __FUNCTION__); \ - _rtx; }) - -#define RTL_FLAG_CHECK4(NAME, RTX, C1, C2, C3, C4) __extension__ \ -({ __typeof (RTX) const _rtx = (RTX); \ - if (GET_CODE (_rtx) != C1 && GET_CODE(_rtx) != C2 \ - && GET_CODE (_rtx) != C3 && GET_CODE(_rtx) != C4) \ - rtl_check_failed_flag (NAME, _rtx, __FILE__, __LINE__, \ - __FUNCTION__); \ - _rtx; }) - -#define RTL_FLAG_CHECK5(NAME, RTX, C1, C2, C3, C4, C5) __extension__ \ -({ __typeof (RTX) const _rtx = (RTX); \ - if (GET_CODE (_rtx) != C1 && GET_CODE (_rtx) != C2 \ - && GET_CODE (_rtx) != C3 && GET_CODE (_rtx) != C4 \ - && GET_CODE (_rtx) != C5) \ - rtl_check_failed_flag (NAME, _rtx, __FILE__, __LINE__, \ - __FUNCTION__); \ - _rtx; }) - -#define RTL_FLAG_CHECK6(NAME, RTX, C1, C2, C3, C4, C5, C6) \ - __extension__ \ -({ __typeof (RTX) const _rtx = (RTX); \ - if (GET_CODE (_rtx) != C1 && GET_CODE (_rtx) != C2 \ - && GET_CODE (_rtx) != C3 && GET_CODE (_rtx) != C4 \ - && GET_CODE (_rtx) != C5 && GET_CODE (_rtx) != C6) \ - rtl_check_failed_flag (NAME,_rtx, __FILE__, __LINE__, \ - __FUNCTION__); \ - _rtx; }) - -#define RTL_FLAG_CHECK7(NAME, RTX, C1, C2, C3, C4, C5, C6, C7) \ - __extension__ \ -({ __typeof (RTX) const _rtx = (RTX); \ - if (GET_CODE (_rtx) != C1 && GET_CODE (_rtx) != C2 \ - && GET_CODE (_rtx) != C3 && GET_CODE (_rtx) != C4 \ - && GET_CODE (_rtx) != C5 && GET_CODE (_rtx) != C6 \ - && GET_CODE (_rtx) != C7) \ - rtl_check_failed_flag (NAME, _rtx, __FILE__, __LINE__, \ - __FUNCTION__); \ - _rtx; }) - #define RTL_INSN_CHAIN_FLAG_CHECK(NAME, RTX) \ __extension__ \ ({ __typeof (RTX) const _rtx = (RTX); \ @@ -1322,6 +1274,87 @@ extern void rtl_check_failed_flag (const char *, c ATTRIBUTE_NORETURN ATTRIBUTE_COLD ; +static inline rtx +rtl_flag_check (bool (*check) (const_rtx), const char *name, rtx rtl, + const char *file, int line, const char *func) +{ + if (!check (rtl)) + rtl_check_failed_flag (name, rtl, file, line, func); + return rtl; +} + +static inline const_rtx +rtl_flag_check (bool (*check) (const_rtx), const char *name, const_rtx rtl, + const char *file, int line, const char *func) +{ + if (!check (rtl)) + rtl_check_failed_flag (name, rtl, file, line, func); + return rtl; +} + +template +inline bool +check_rtl_code (const_rtx rtl) +{ + if (GET_CODE (rtl) != C1) + return false; + return true; +} + +template +inline bool +check_rtl_code (const_rtx rtl) +{ + if (GET_CODE (rtl) != C1 && GET_CODE (rtl) != C2) + return false; + return true; +} + +template +inline bool +check_rtl_code (const_rtx rtl) +{ + if (GET_CODE (rtl) != C1 && GET_CODE (rtl) != C2 + && GET_CODE (rtl) != C3) + return false; + return true; +} + +template +inline bool +check_rtl_code (const_rtx rtl) +{ + if (GET_CODE (rtl) != C1 && GET_CODE (rtl) != C2 + && GET_CODE (rtl) != C3 && GET_CODE (rtl) != C4) + return false; + return true; +} + +template +inline bool +check_rtl_code (const_rtx rtl) +{ + if (GET_CODE (rtl) != C1 && GET_CODE (rtl) != C2 + && GET_CODE (rtl) != C3 && GET_CODE (rtl) != C4 + && GET_CODE (rtl) != C5) + return false; + return true; +} + +template +inline bool +check_rtl_code (const_rtx rtl) +{ + if (GET_CODE (rtl) != C1 && GET_CODE (rtl) != C2 + && GET_CODE (rtl) != C3 && GET_CODE (rtl) != C4 + && GET_CODE (rtl) != C5 && GET_CODE (rtl) != C6) + return false; + return true; +} + #else /* not ENABLE_RTL_FLAG_CHECKING */ #define RTL_FLAG_CHECK1(NAME, RTX, C1) (RTX) @@ -1330,7 +1363,6 @@ extern void rtl_check_failed_flag (const char *, c #define RTL_FLAG_CHECK4(NAME, RTX, C1, C2, C3, C4) (RTX) #define RTL_FLAG_CHECK5(NAME, RTX, C1, C2, C3, C4, C5) (RTX) #define RTL_FLAG_CHECK6(NAME, RTX, C1, C2, C3, C4, C5, C6) (RTX) -#define RTL_FLAG_CHECK7(NAME, RTX, C1, C2, C3, C4, C5, C6, C7) (RTX) #define RTL_INSN_CHAIN_FLAG_CHECK(NAME, RTX) (RTX) #endif