public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Marek Polacek <mpolacek@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-8916] c++: constinit on pointer to function [PR104066] Date: Fri, 18 Nov 2022 00:43:24 +0000 (GMT) [thread overview] Message-ID: <20221118004324.08F833858004@sourceware.org> (raw) https://gcc.gnu.org/g:14faa5f585f6025df1e04c8c8b34340ff5e4d494 commit r12-8916-g14faa5f585f6025df1e04c8c8b34340ff5e4d494 Author: Marek Polacek <polacek@redhat.com> Date: Thu Nov 17 11:59:29 2022 -0500 c++: constinit on pointer to function [PR104066] [dcl.constinit]: "The constinit specifier shall be applied only to a declaration of a variable with static or thread storage duration." Thus, this ought to be OK: constinit void (*p)() = nullptr; but the error message I introduced when implementing constinit was not looking at funcdecl_p, so the code above was rejected. Fixed thus. I'm checking constinit_p first because I think that's far more likely to be false than funcdecl_p. PR c++/104066 gcc/cp/ChangeLog: * decl.cc (grokdeclarator): Check funcdecl_p before complaining about constinit. gcc/testsuite/ChangeLog: * g++.dg/cpp2a/constinit18.C: New test. (cherry picked from commit 7b3b2f50953c5143d4b14b59d322d8a793f411dd) Diff: --- gcc/cp/decl.cc | 2 +- gcc/testsuite/g++.dg/cpp2a/constinit18.C | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index cd1522f9a9f..ed47d262078 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -12963,7 +12963,7 @@ grokdeclarator (const cp_declarator *declarator, "an array", name); return error_mark_node; } - if (constinit_p) + if (constinit_p && funcdecl_p) { error_at (declspecs->locations[ds_constinit], "%<constinit%> on function return type is not " diff --git a/gcc/testsuite/g++.dg/cpp2a/constinit18.C b/gcc/testsuite/g++.dg/cpp2a/constinit18.C new file mode 100644 index 00000000000..51b4f0273be --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/constinit18.C @@ -0,0 +1,12 @@ +// PR c++/104066 +// { dg-do compile { target c++20 } } + +constinit void (*p)() = nullptr; +constinit void (*pp)() = nullptr; +void fn(); +constinit void (&r)() = fn; + +extern constinit long (* const syscall_reexported) (long, ...); + +constinit void bad (); // { dg-error ".constinit. on function return type is not allowed" } +constinit void bad () { } // { dg-error ".constinit. on function return type is not allowed" }
reply other threads:[~2022-11-18 0:43 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221118004324.08F833858004@sourceware.org \ --to=mpolacek@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).