diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2023-04-27 11:35:55 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2023-04-27 11:35:55 +0200 |
| commit | a1030fbf70eef5b635e4fbb904ec7209ebd137ca (patch) | |
| tree | 3a92867dffd66e5ab33578e84e12f39d5b165279 /gcc | |
| parent | 429c72eb632040bacef9569b6d783d72fee93b42 (diff) | |
| download | gcc-a1030fbf70eef5b635e4fbb904ec7209ebd137ca.zip gcc-a1030fbf70eef5b635e4fbb904ec7209ebd137ca.tar.gz gcc-a1030fbf70eef5b635e4fbb904ec7209ebd137ca.tar.bz2 | |
c: Fix up error-recovery on functions initialized as variables [PR109412]
The change to allow empty initializers in C broke error-recovery on the
following testcase. We are emitting function %qD is initialized like a
variable error early; if the initializer is non-empty, we just emit
another error that the initializer is invalid. Previously if it was empty,
we'd emit another error that scalar is being initialized by empty
initializer (not really correct), but now we instead just try to
build_zero_cst for the FUNCTION_TYPE and ICE on it.
The following patch just emits the same diagnostics for the empty
initializers as we emit for the non-empty ones.
2023-04-27 Jakub Jelinek <jakub@redhat.com>
PR c/107682
PR c/109412
* c-typeck.cc (pop_init_level): If constructor_type is FUNCTION_TYPE,
reject empty initializer as invalid.
* gcc.dg/pr109412.c: New test.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/c/c-typeck.cc | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr109412.c | 20 |
2 files changed, 25 insertions, 0 deletions
diff --git a/gcc/c/c-typeck.cc b/gcc/c/c-typeck.cc index 7079d4e..a178796 100644 --- a/gcc/c/c-typeck.cc +++ b/gcc/c/c-typeck.cc @@ -9374,6 +9374,11 @@ pop_init_level (location_t loc, int implicit, { if (constructor_erroneous || constructor_type == error_mark_node) ret.value = error_mark_node; + else if (TREE_CODE (constructor_type) == FUNCTION_TYPE) + { + error_init (loc, "invalid initializer"); + ret.value = error_mark_node; + } else if (TREE_CODE (constructor_type) == POINTER_TYPE) /* Ensure this is a null pointer constant in the case of a 'constexpr' object initialized with {}. */ diff --git a/gcc/testsuite/gcc.dg/pr109412.c b/gcc/testsuite/gcc.dg/pr109412.c new file mode 100644 index 0000000..11adce5 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr109412.c @@ -0,0 +1,20 @@ +/* PR c/107682 */ +/* PR c/109412 */ +/* { dg-do compile } */ +/* { dg-options "" } */ + +char bar () = {}; /* { dg-error "function 'bar' is initialized like a variable" } */ + /* { dg-error "invalid initializer" "" { target *-*-* } .-1 } */ + /* { dg-message "near initialization for 'bar'" "" { target *-*-* } .-2 } */ +char baz () = { 1 }; /* { dg-error "function 'baz' is initialized like a variable" } */ + /* { dg-error "invalid initializer" "" { target *-*-* } .-1 } */ + /* { dg-message "near initialization for 'baz'" "" { target *-*-* } .-2 } */ +void +foo () +{ + int qux () = {}; /* { dg-error "function 'qux' is initialized like a variable" } */ + /* { dg-error "invalid initializer" "" { target *-*-* } .-1 } */ + /* { dg-message "near initialization for 'qux'" "" { target *-*-* } .-2 } */ + int corge () = { 1 }; /* { dg-error "function 'corge' is initialized like a variable" } */ + /* { dg-error "invalid initializer" "" { target *-*-* } .-1 } */ +} /* { dg-message "near initialization for 'corge'" "" { target *-*-* } .-2 } */ |