diff options
| author | Marek Polacek <polacek@redhat.com> | 2022-11-17 11:59:29 -0500 |
|---|---|---|
| committer | Marek Polacek <polacek@redhat.com> | 2022-11-17 19:15:57 -0500 |
| commit | 7b3b2f50953c5143d4b14b59d322d8a793f411dd (patch) | |
| tree | e69fd3fbafeda0b36353ca4c7be6aacb80d3cd2e /gcc | |
| parent | 3f467ea953431aa6af12aaed6d32f476f7ace1e5 (diff) | |
| download | gcc-7b3b2f50953c5143d4b14b59d322d8a793f411dd.zip gcc-7b3b2f50953c5143d4b14b59d322d8a793f411dd.tar.gz gcc-7b3b2f50953c5143d4b14b59d322d8a793f411dd.tar.bz2 | |
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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/decl.cc | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/constinit18.C | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index d28889e..9a7b1a6 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -13071,7 +13071,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 0000000..51b4f02 --- /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" } |