From patchwork Fri Jan 27 21:39:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 49700 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1056589wrn; Fri, 27 Jan 2023 13:40:34 -0800 (PST) X-Google-Smtp-Source: AK7set/7D7+IjHJiQXiRa37xmcfRxpf2WlZQ/iNhDtSl2mY4I5qxP29H9Y7o/bT9Z8xTBfcdQr6w X-Received: by 2002:a05:6402:528a:b0:49f:88ef:8d76 with SMTP id en10-20020a056402528a00b0049f88ef8d76mr18874265edb.29.1674855634387; Fri, 27 Jan 2023 13:40:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674855634; cv=none; d=google.com; s=arc-20160816; b=jKlvQgpbxz8WbAQhfUJwOwLrSsOrxb/m8N6B0IQ0ND8KIl3PXY0CiPNopyP71hC6eP 7fFa9WojRyr9VheTitjK8qVL4VjQfjwlhoYO2AyAp9zPdLQut61qYHojGtBklidLuWUa VHvxV7qTakHhUdmZ2q+5c1Oe8Ei8HdKXe4Vu6gfk0K6r3w3NmKw/JyzWCtHMRsOtow/A e3depQv1iKuYPz9enRB41aF+DjTAdvrUxp1IAknAiu6O1NPLER/nY4Tycu10bflnsfF2 nfCzoYMCh9ZFUEpMZU7gIRjyc5WtZBae8sfelCUqPyLbV1IMwqELWnI5myhlUR9CmU7l 5pXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version:message-id:subject :to:from:date:ironport-sdr:dmarc-filter:delivered-to; bh=+mSYAvRroa25b3vJA78JpNY1ax8yvUlNs+REdL/esIU=; b=KHbpwLRW32xnLoixUQriq9Hpkcf3vySyVCNFm0FS+eufUM+gHdXXoLRNhaNGQ+6YL9 5kUPii+QBczecmLVqTfd7DvJm6b27rjjuxDUm2R9hShyl8m0llAw/sYrlKOkfaLHb6m6 AxPsBR5iw3/3Tr5CuJvFnUPzSdkkfQovs8AXG+dfDwifhYvoCLku14ahHgAVBN+UqxiC d/dUUftcZNB4f48vap2/O993n3Z43/fveYTHB1+Pk69cmIPOVMmbIWwhJRenEZj0TXh9 ykhVHBZCgC1YaUQxnsPeH53f9TlgvBVduT217+P7rY10ncufYVtCwM87kaXFCWlGJCax VodA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id y19-20020a056402135300b004a20e8fc5cfsi2504863edw.489.2023.01.27.13.40.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 13:40:34 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CA7673858C3A for ; Fri, 27 Jan 2023 21:40:29 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com [68.232.137.252]) by sourceware.org (Postfix) with ESMTPS id 23C8A3858D20 for ; Fri, 27 Jan 2023 21:40:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 23C8A3858D20 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.97,252,1669104000"; d="scan'208";a="94994026" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 27 Jan 2023 13:40:03 -0800 IronPort-SDR: C539A6YJxYuhDiKdVvbmC84Kpx0OSsw4hIZZVWAPg/n/GUQ/l58Tig22fADurGrYu0lzB/kXaN CrOPZuh8mE13se4DTK+JYi6z2Ae2iyL3P0tD2X1Lr9lxwoBrm+6pqxIA2qMsrsxcj0NVxFQYxJ O+Q9QZzEUuglZREj7bIWS5EYjyKlZf8pVgRLAaJqiuLb6fzi/65LWITBTfA06EnSxT1OM2tV49 8MwulFD0mx0hqBBLvDTUUTeZlmBE9PEmeM6yYPL1LlwJcCgWMLjTmzYM3uX7LrjzjnvaPtVQRo fOs= Date: Fri, 27 Jan 2023 21:39:59 +0000 From: Joseph Myers To: Subject: [committed] c: Disallow braces around C2x auto initializers Message-ID: MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-11.mgc.mentorg.com (139.181.222.11) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-3114.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, 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 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: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756213421351889096?= X-GMAIL-MSGID: =?utf-8?q?1756213421351889096?= WG14 agreed at this week's meeting to remove support for braces around auto scalar initializers, as incompatible with C++ auto handling of braced initializers; thus remove that support in GCC. Bootstrapped with no regressions for x86_64-pc-linux-gnu. gcc/c/ * c-parser.cc (c_parser_declaration_or_fndef): Do not allow braces around auto initializer. gcc/testsuite/ * gcc.dg/c2x-auto-1.c, gcc.dg/c2x-auto-3.c: Expect braces around auto initializers to be disallowed. diff --git a/gcc/c/c-parser.cc b/gcc/c/c-parser.cc index 803b04b8dc1..69230002bc8 100644 --- a/gcc/c/c-parser.cc +++ b/gcc/c/c-parser.cc @@ -2480,18 +2480,7 @@ c_parser_declaration_or_fndef (c_parser *parser, bool fndef_ok, int flag_sanitize_save = flag_sanitize; if (nested && !empty_ok) flag_sanitize = 0; - if (std_auto_type_p - && c_parser_next_token_is (parser, CPP_OPEN_BRACE)) - { - matching_braces braces; - braces.consume_open (parser); - init = c_parser_expr_no_commas (parser, NULL); - if (c_parser_next_token_is (parser, CPP_COMMA)) - c_parser_consume_token (parser); - braces.skip_until_found_close (parser); - } - else - init = c_parser_expr_no_commas (parser, NULL); + init = c_parser_expr_no_commas (parser, NULL); if (std_auto_type_p) finish_underspecified_init (underspec_name, underspec_state); diff --git a/gcc/testsuite/gcc.dg/c2x-auto-1.c b/gcc/testsuite/gcc.dg/c2x-auto-1.c index f8460fb3bfb..c50daccfe89 100644 --- a/gcc/testsuite/gcc.dg/c2x-auto-1.c +++ b/gcc/testsuite/gcc.dg/c2x-auto-1.c @@ -4,14 +4,14 @@ auto i = 1; extern int i; -static auto l = { 0L }; +static auto l = 0L; extern long l; extern auto const d = 0.0; /* { dg-warning "initialized and declared 'extern'" } */ extern const double d; double dx; auto ((i2)) = 3; extern int i2; -const auto i3 [[]] = { 4, }; +const auto i3 [[]] = 4; extern int i4; thread_local auto f = 1.0f; float ff; diff --git a/gcc/testsuite/gcc.dg/c2x-auto-3.c b/gcc/testsuite/gcc.dg/c2x-auto-3.c index a34ce31f6be..1ab3cc74d35 100644 --- a/gcc/testsuite/gcc.dg/c2x-auto-3.c +++ b/gcc/testsuite/gcc.dg/c2x-auto-3.c @@ -62,3 +62,10 @@ f5 () { static int auto e10 = 3; /* { dg-error "multiple storage classes in declaration specifiers" } */ } + +void +f6 () +{ + static auto l = { 0L }; /* { dg-error "expected expression" } */ + const auto i3 [[]] = { 4, }; /* { dg-error "expected expression" } */ +}