From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 929903858439 for ; Thu, 16 Dec 2021 21:15:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 929903858439 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-142-gdOuEom4Pr6fwI0ODCa1vQ-1; Thu, 16 Dec 2021 16:15:19 -0500 X-MC-Unique: gdOuEom4Pr6fwI0ODCa1vQ-1 Received: by mail-qk1-f200.google.com with SMTP id bs14-20020a05620a470e00b0046b1e29f53cso166719qkb.0 for ; Thu, 16 Dec 2021 13:15:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=2N+00hr4VGPjMi3w8/EWtXYGCi/BgOIRX5exGftTtJM=; b=OZ0xS59tRu0qL2bRf03Y6HqHv4aK3uaKa7i5FzFZ964ivo3Lza5r2Jsgr2nYgcaT+A l4eEVJnD7Q+6rYMsjBPKMGo/qeAH6hSpZvlyzTTMz6MfqhdJoCAd5eFSCqeZKexeEX5R oROmM1bJRGd1j9e/YemBRA2XFyRHRlJLK52Qu2sVot4w9HW4MB1QW9ZmuCQBclWEe3DQ vOVgPAgZf36RIVyqlhGivdg56XdUElY1UqnSfRrC0yvG7ZF1uZH2GmYNFh3Pthmf9+aS uDNqON7+QOpI8SAKfRshO82XdlmLHVShc0p0/dKhiboyZ0quLZUaT1ZvIZwc4zU32Yep 920w== X-Gm-Message-State: AOAM533UDCmWmNVI+PCx1AF04n+u3fFBESyeRP+x4Vf6r7eudHksHIcZ RUPjAVLJPuBcsyPwyw8T49XndemCOgT/V2mbJhSGt8wSpi2CD5ytQgXfvYHq0cLZHC6+t80229N s8kUVoHN45BZkwBti0w== X-Received: by 2002:a05:6214:20a1:: with SMTP id 1mr3700qvd.29.1639689318282; Thu, 16 Dec 2021 13:15:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJw+bX12h++x85qwv7uAIcAbEfHVv4/HTQ3yDJeRL9mjbJqvjp2GwktUfkrY37PYOJmMjGY2xA== X-Received: by 2002:a05:6214:20a1:: with SMTP id 1mr3676qvd.29.1639689317935; Thu, 16 Dec 2021 13:15:17 -0800 (PST) Received: from [192.168.1.149] (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id 22sm5268251qtw.12.2021.12.16.13.15.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 16 Dec 2021 13:15:17 -0800 (PST) Message-ID: <0d9c7a6a-b391-a372-01cc-555bcf737433@redhat.com> Date: Thu, 16 Dec 2021 16:15:16 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Subject: Re: [PATCH] c++: delayed noexcept in member function template [PR99980] To: Marek Polacek , GCC Patches References: <20211216160014.24338-1-polacek@redhat.com> From: Jason Merrill In-Reply-To: <20211216160014.24338-1-polacek@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: , X-List-Received-Date: Thu, 16 Dec 2021 21:15:22 -0000 On 12/16/21 11:00, Marek Polacek wrote: > Some time ago I noticed that we don't properly delay parsing of > noexcept for member function templates. This patch fixes that. > > It didn't work because even though we set CP_PARSER_FLAGS_DELAY_NOEXCEPT > in cp_parser_member_declaration, member template declarations take > a different path: we call cp_parser_template_declaration and return > prior to setting the flag. > > Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? OK. > PR c++/99980 > > gcc/cp/ChangeLog: > > * parser.c (cp_parser_single_declaration): Maybe pass > CP_PARSER_FLAGS_DELAY_NOEXCEPT down to cp_parser_init_declarator. > > gcc/testsuite/ChangeLog: > > * g++.dg/cpp0x/noexcept71.C: New test. > --- > gcc/cp/parser.c | 7 +++++- > gcc/testsuite/g++.dg/cpp0x/noexcept71.C | 31 +++++++++++++++++++++++++ > 2 files changed, 37 insertions(+), 1 deletion(-) > create mode 100644 gcc/testsuite/g++.dg/cpp0x/noexcept71.C > > diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c > index c2564e51e41..c19e5f1359d 100644 > --- a/gcc/cp/parser.c > +++ b/gcc/cp/parser.c > @@ -31673,8 +31673,13 @@ cp_parser_single_declaration (cp_parser* parser, > && (cp_lexer_next_token_is_not (parser->lexer, CPP_SEMICOLON) > || decl_specifiers.type != error_mark_node)) > { > + int flags = CP_PARSER_FLAGS_TYPENAME_OPTIONAL; > + /* We don't delay parsing for friends, though CWG 2510 may change > + that. */ > + if (member_p && !(friend_p && *friend_p)) > + flags |= CP_PARSER_FLAGS_DELAY_NOEXCEPT; > decl = cp_parser_init_declarator (parser, > - CP_PARSER_FLAGS_TYPENAME_OPTIONAL, > + flags, > &decl_specifiers, > checks, > /*function_definition_allowed_p=*/true, > diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept71.C b/gcc/testsuite/g++.dg/cpp0x/noexcept71.C > new file mode 100644 > index 00000000000..361d6ad7b60 > --- /dev/null > +++ b/gcc/testsuite/g++.dg/cpp0x/noexcept71.C > @@ -0,0 +1,31 @@ > +// PR c++/99980 > +// { dg-do compile { target c++11 } } > + > +#define SA(X) static_assert(X, #X) > + > +struct S { > + template > + void f(T) noexcept(B); > + > + struct N { > + template > + void f2(T) noexcept(B); > + }; > + > + static constexpr bool B = true; > +}; > + > +S s; > +SA(noexcept(s.f(10))); > +S::N n; > +SA(noexcept(n.f2(10))); > + > +struct Bad { > + template > + using U = void() noexcept(B); // { dg-error "not declared" } > + > + template > + friend void friendo() noexcept(B); // { dg-error "not declared" } > + > + static constexpr bool B = true; > +}; > > base-commit: 41cc28405c74a5ec59c6725274aaedefa9ca5887