From patchwork Sat Nov 11 01:13:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 164043 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp1487274vqs; Fri, 10 Nov 2023 17:19:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IH0fWX/dfJ4fgJCCEMb67z9Ix0YVxJ1a89vj3pE09lSB+DMv4ICGlxdfHrpApA6SjDSmbXC X-Received: by 2002:a05:6902:1509:b0:d9a:4fa0:dca9 with SMTP id q9-20020a056902150900b00d9a4fa0dca9mr952931ybu.25.1699665545581; Fri, 10 Nov 2023 17:19:05 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1699665545; cv=pass; d=google.com; s=arc-20160816; b=TcY+FMLd+bNiMNiOaFGRiQFPUgRym+ombpE8mqHE6udHdRXY2d2Bbpd3pGOGoxYack hNZt5/kUwMbzYJpDx/ZKjQr0aRSFb1Kk+8QCFW88km7lUA5ANGYKAfqnppPHvDIWy6Ch fjBol4KdAyLxBS2GjWJA6mC/C54RNq17e+QXOdb5WX+xOiUeD98vM0EvhFsUgC6nPr8T aRCfR6fIvMMrGmhUJCAD1VkuN2VngblXn7qH/2L3NIwbAGvwgfSzPZcDALn2DBenRqzy sN5kdyU5U2FUKucGN5zWriYbjQDdmwu09f5JR8hU5py230kdDfbmcavjTs7aIdjjU2AK 7D3Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-disposition:user-agent :in-reply-to:mime-version:references:message-id:subject:cc:to:from :date:dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=EiNVB5NEtGBerpRGWycHCRkd8jBOQI1C4yDVmWWy804=; fh=rsfJLMIL/7j+58qzkgIXBlfQSah3iXypQc76SN5PqTs=; b=M8OV4GN1GubbV5JX/htMmmUlyQxWK4Q6fzeslydPCSCRIC3py6r57qklD1nXhbDmv6 DFwBhadGY8K4CFHlzahYlhCPQRKQJ9izgYzq/CIwE8Q3lnYjQA95HH0bmFTEQJbGChf1 I97Ev5BDXaajjpjBuNOgyzk1G9VSgu6oDvyCWBO1BAg3TGItAlkByIaGhfLcdESYVJJq 6cqBsRNQArZeC7GelImBpS/lATtem4tv73MlVjHzo4qpTyw+QNuMeIRJ4fqLgLkoXYZ6 c/BVir6wY/+O54EJzbL7mtOMN6yP5wCWqDzUDsYU1DVUGv0jl1NrpbdTRgn+WnMCkykg ujcg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=F+GmtjuU; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id v4-20020a0ced44000000b0065d124684a6si659628qvq.88.2023.11.10.17.19.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Nov 2023 17:19:05 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=F+GmtjuU; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5B4D5385840A for ; Sat, 11 Nov 2023 01:19:05 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id D1DD7385841E for ; Sat, 11 Nov 2023 01:18:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D1DD7385841E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D1DD7385841E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699665521; cv=none; b=lHZlgkNDyuD4wfu14btzu6a6E1JfS6WMA4rBanfG7IOwGfOx8DH1Z1R8P8SbGUBa4MB4I0vcwuYg8S2QW5NTPQ510qhEbb2UBXez9RHYDBOY80JQrY9ii09q8zuPb0OVuT64kPXXIM+ZIcfgRB5Q8KrgymDhoDeYLjXyW7e9s1o= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699665521; c=relaxed/simple; bh=l/e4GUmGHq7GJAU20TySAEAFSAgMhXy+WOlMEY+6jIw=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=G3e2zJ1pw7NlCDTbFVCjBH7RgwTULLfkxVsZ6s+PdGfMcX03TouZrzi1K/osTvLRNzq+7zNub8Gy7TIcKKkcgAcKjFOKHaouTDaYFGUleUhIVM6+KbQpGyoaLEnjYavPcBPYGXz7copiM9dGtm1HNEID7HINd3qzHlMCMx9ZR/A= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699665519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=EiNVB5NEtGBerpRGWycHCRkd8jBOQI1C4yDVmWWy804=; b=F+GmtjuUuQ++CPqWCDwBhDK2tJxUbIg1uPLtW3hCpBlfihQONZDLLVDmxx+em1YW9SljJU pv9s0AyP51KEqriptdohp1nRTjxC84cZkQdhMSI0BzRhNluf7m2pF5VAyVFzqYNxNM7OQe vml9YUIC2kL4h9w1FQ6Z7mOnfM7TTBg= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-470-7WQ0cBv4M5atGsA0PvzAEg-1; Fri, 10 Nov 2023 20:18:38 -0500 X-MC-Unique: 7WQ0cBv4M5atGsA0PvzAEg-1 Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-66da680f422so27806676d6.3 for ; Fri, 10 Nov 2023 17:18:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699665213; x=1700270013; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EiNVB5NEtGBerpRGWycHCRkd8jBOQI1C4yDVmWWy804=; b=SEtfRKkrO2i9/RdEUc0XO7QHsXxmNRHcEL97QtBCZoqzSbhhSN/KI/nD2VmYZ5llFF oTw7tB2NkbYEi6xefieiNGxzk2pdgOU9jjV2uEPMOB02JV0MLqlWuj+rPPGNRnmYpsYa JE0pk0mPyXf94IBWlKhLPieWmaGR1S9RciyRfYZdFIdO8AFCdxqgvZSL/AKFIwDtBJuB vCuEocy7ebb52cjpivl5sFWf1msYmcRt329VprMEfAdgbsJGdRGt/mptzBHDAVJEiwMD caXzQmPCVkIQAJXgNwsjtNYuar+UJZAn41+3o9L2pVMOTnr/DiAiYZJfWt7ga9z+6An+ CnyA== X-Gm-Message-State: AOJu0YyDjZB+KizJYJp5CdC20nPjZhM01Qb5DVS4yn2E2uhvpLbcb46e Vu81fJM8kpjzuaDFQ50ZdQ4AOvssP7/pa9PUa1IcbYVHnKTriiat4+gE48VbHua9eldah8UwasM PF6ns9CgTU/EPgjf3lRB2kjQjWQ== X-Received: by 2002:a0c:d6c6:0:b0:671:49d7:6077 with SMTP id l6-20020a0cd6c6000000b0067149d76077mr837290qvi.30.1699665212958; Fri, 10 Nov 2023 17:13:32 -0800 (PST) X-Received: by 2002:a0c:d6c6:0:b0:671:49d7:6077 with SMTP id l6-20020a0cd6c6000000b0067149d76077mr837280qvi.30.1699665212644; Fri, 10 Nov 2023 17:13:32 -0800 (PST) Received: from redhat.com (2603-7000-9500-34a5-0000-0000-0000-1db4.res6.spectrum.com. [2603:7000:9500:34a5::1db4]) by smtp.gmail.com with ESMTPSA id c4-20020a05621401c400b006754772bfd4sm243603qvt.21.2023.11.10.17.13.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Nov 2023 17:13:32 -0800 (PST) Date: Fri, 10 Nov 2023 20:13:30 -0500 From: Marek Polacek To: Jason Merrill Cc: GCC Patches Subject: [PATCH v2] c++: fix parsing with auto(x) [PR112410] Message-ID: References: <20231109195835.429291-1-polacek@redhat.com> <1c680274-040d-40d7-b998-b100084c0ba5@redhat.com> MIME-Version: 1.0 In-Reply-To: <1c680274-040d-40d7-b998-b100084c0ba5@redhat.com> User-Agent: Mutt/2.2.9 (2022-11-12) X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782117773422251526 X-GMAIL-MSGID: 1782228499014329445 On Thu, Nov 09, 2023 at 07:07:03PM -0500, Jason Merrill wrote: > On 11/9/23 14:58, Marek Polacek wrote: > > Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? > > > > -- >8 -- > > Here we are wrongly parsing > > > > int y(auto(42)); > > > > which uses the C++23 cast-to-prvalue feature, and initializes y to 42. > > However, we were treating the auto as an implicit template parameter. > > > > Fixing the auto{42} case is easy, but when auto is followed by a (, > > I found the fix to be much more involved. For instance, we cannot > > use cp_parser_expression, because that can give hard errors. It's > > also necessary to disambiguate 'auto(i)' as 'auto i', not a cast. > > auto(), auto(int), auto(f)(int), auto(*), auto(i[]), auto(...), etc. > > are all function declarations. We have to look at more than one > > token to decide. > > Yeah, this is a most vexing parse problem. The code is synthesizing > template parameters before we've resolved whether the auto is a > decl-specifier or not. > > > In this fix, I'm (ab)using cp_parser_declarator, with member_p=false > > so that it doesn't commit. But it handles even more complicated > > cases as > > > > int fn (auto (*const **&f)(int) -> char); > > But it doesn't seem to handle the extremely vexing > > struct A { > A(int,int); > }; > > int main() > { > int a; > A b(auto(a), 42); > } Argh. This test should indeed be accepted and is currently rejected, but it's a different problem: 'b' is at block scope and you can't have a template there. But when I put it into a namespace scope, it shows that my patch doesn't work correctly. I've added auto-fncast14.C for the latter and opened c++/112482 for the block-scope problem. > I think we need to stop synthesizing immediately when we see RID_AUTO, and > instead go back after we successfully parse a declaration and synthesize for > any autos we saw along the way. :/ That seems very complicated :(. I had a different idea though; how about the following patch? The idea is that if we see that parsing the parameter-declaration-list didn't work, we undo what synthesize_ did, and let cp_parser_initializer parse "(auto(42))", which should succeed. I checked that after cp_finish_decl y is initialized to 42. Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? -- >8 -- Here we are wrongly parsing int y(auto(42)); which uses the C++23 cast-to-prvalue feature, and initializes y to 42. However, we were treating the auto as an implicit template parameter. Fixing the auto{42} case is easy, but when auto is followed by a (, I found the fix to be much more involved. For instance, we cannot use cp_parser_expression, because that can give hard errors. It's also necessary to disambiguate 'auto(i)' as 'auto i', not a cast. auto(), auto(int), auto(f)(int), auto(*), auto(i[]), auto(...), etc. are all function declarations. This patch rectifies that by undoing the implicit function template modification. In the test above, we should notice that the parameter list is ill-formed, and since we've synthesized an implicit template parameter, we undo it by calling abort_fully_implicit_template. Then, we'll parse the "(auto(42))" as an initializer. PR c++/112410 gcc/cp/ChangeLog: * parser.cc (cp_parser_simple_type_specifier): Disambiguate between a variable and function declaration with auto. (cp_parser_parameter_declaration_clause): Maybe call abort_fully_implicit_template if it turned out the parameter list was ill-formed. gcc/testsuite/ChangeLog: * g++.dg/cpp23/auto-fncast13.C: New test. * g++.dg/cpp23/auto-fncast14.C: New test. --- gcc/cp/parser.cc | 27 +++++++++- gcc/testsuite/g++.dg/cpp23/auto-fncast13.C | 61 ++++++++++++++++++++++ gcc/testsuite/g++.dg/cpp23/auto-fncast14.C | 9 ++++ 3 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp23/auto-fncast13.C create mode 100644 gcc/testsuite/g++.dg/cpp23/auto-fncast14.C base-commit: e0c1476d5d7c450b1b16a40364cea4e91237ea93 diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 5116bcb78f6..947351b09b8 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -19991,6 +19991,8 @@ cp_parser_simple_type_specifier (cp_parser* parser, /* The 'auto' might be the placeholder return type for a function decl with trailing return type. */ bool have_trailing_return_fn_decl = false; + /* Or it might be auto(x) or auto {x}. */ + bool decay_copy = false; cp_parser_parse_tentatively (parser); cp_lexer_consume_token (parser->lexer); @@ -20008,6 +20010,11 @@ cp_parser_simple_type_specifier (cp_parser* parser, /*consume_paren*/true); continue; } + else if (cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE)) + { + decay_copy = true; + break; + } if (cp_lexer_next_token_is (parser->lexer, CPP_DEREF)) { @@ -20019,6 +20026,11 @@ cp_parser_simple_type_specifier (cp_parser* parser, } cp_parser_abort_tentative_parse (parser); + if (decay_copy) + { + type = error_mark_node; + break; + } if (have_trailing_return_fn_decl) { type = make_auto (); @@ -24973,7 +24985,20 @@ cp_parser_parameter_declaration_clause (cp_parser* parser, parameter-declaration-list, then the entire parameter-declaration-clause is erroneous. */ if (parameters == error_mark_node) - return NULL_TREE; + { + /* For code like + int x(auto(42)); + A a(auto(i), 42); + we have synthesized an implicit template parameter and marked + what we thought was a function as an implicit function template. + But now, having seen the whole parameter list, we know it's not + a function declaration, so undo that. */ + if (parser->fully_implicit_function_template_p + /* Don't do this for the inner (). */ + && parser->default_arg_ok_p) + abort_fully_implicit_template (parser); + return NULL_TREE; + } /* Peek at the next token. */ token = cp_lexer_peek_token (parser->lexer); diff --git a/gcc/testsuite/g++.dg/cpp23/auto-fncast13.C b/gcc/testsuite/g++.dg/cpp23/auto-fncast13.C new file mode 100644 index 00000000000..1bceffb70cf --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp23/auto-fncast13.C @@ -0,0 +1,61 @@ +// PR c++/112410 +// { dg-do compile { target c++23 } } + +int f1 (auto(int) -> char); +int f2 (auto x); +int f3 (auto); +int f4 (auto(i)); + +int v1 (auto(42)); +int v2 (auto{42}); +int e1 (auto{i}); // { dg-error "not declared" } +int i; +int v3 (auto{i}); +int v4 (auto(i + 1)); +int v5 (auto(+i)); +int v6 (auto(i = 4)); + +int f5 (auto(i)); +int f6 (auto()); +int f7 (auto(int)); +int f8 (auto(f)(int)); +int f9 (auto(...) -> char); +// FIXME: ICEs (PR c++/89867) +//int f10 (auto(__attribute__((unused)) i)); +int f11 (auto((i))); +int f12 (auto(i[])); +int f13 (auto(*i)); +int f14 (auto(*)); + +int e2 (auto{}); // { dg-error "invalid use of .auto." } +int e3 (auto(i, i)); // { dg-error "invalid use of .auto." } + +char bar (int); +char baz (); +char qux (...); + +void +g (int i) +{ + f1 (bar); + f2 (42); + f3 (42); + f4 (42); + f5 (42); + f6 (baz); + f7 (bar); + f8 (bar); + f9 (qux); +// f10 (42); + f11 (42); + f12 (&i); + f13 (&i); + f14 (&i); + + v1 = 1; + v2 = 2; + v3 = 3; + v4 = 4; + v5 = 5; + v6 = 6; +} diff --git a/gcc/testsuite/g++.dg/cpp23/auto-fncast14.C b/gcc/testsuite/g++.dg/cpp23/auto-fncast14.C new file mode 100644 index 00000000000..9e7a06c87d5 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp23/auto-fncast14.C @@ -0,0 +1,9 @@ +// PR c++/112410 +// { dg-do compile { target c++23 } } + +struct A { + A(int,int); +}; + +int a; +A b1(auto(a), 42);