[gcc r13-8495] c: Fix ICE for nested enum redefinitions with/without fixed underlying type [PR112571]

[Joseph Myers via Gcc-cvs]

https://gcc.gnu.org/g:f2af129b68bc6b20f79a9a44b28c96650baa702c

commit r13-8495-gf2af129b68bc6b20f79a9a44b28c96650baa702c
Author: Joseph Myers <josmy...@redhat.com>
Date:   Wed Jan 31 21:39:53 2024 +0000

    c: Fix ICE for nested enum redefinitions with/without fixed underlying type 
[PR112571]
    
    Bug 112571 reports an ICE-on-invalid for cases where an enum is
    defined, without a fixed underlying type, inside the enum type
    specifier for a definition of that same enum with a fixed underlying
    type.
    
    The ultimate cause is attempting to access ENUM_UNDERLYING_TYPE in a
    case where it is NULL.  Avoid this by clearing
    ENUM_FIXED_UNDERLYING_TYPE_P in thie case of inconsistent definitions.
    
    Bootstrapped wth no regressions for x86_64-pc-linux-gnu.
    
    (Note: for this GCC 13 branch backport, the tests were changed to use
    -std=c2x not -std=c23, and c23-enum-9.c was changed to expect
    different diagnostics because GCC 13 branch doesn't have the C23 tag
    compatibility support for redefinitions of tagged types and
    enumerators.)
    
            PR c/112571
    
    gcc/c/
            * c-decl.cc (start_enum): Clear ENUM_FIXED_UNDERLYING_TYPE_P when
            defining without a fixed underlying type an enumeration previously
            declared with a fixed underlying type.
    
    gcc/testsuite/
            * gcc.dg/c23-enum-9.c, gcc.dg/c23-enum-10.c: New tests.
    
    (cherry picked from commit d22d1a9346f27db41459738c6eb404f8f0956e6f)

Diff:
---
 gcc/c/c-decl.cc                    | 7 +++++--
 gcc/testsuite/gcc.dg/c23-enum-10.c | 6 ++++++
 gcc/testsuite/gcc.dg/c23-enum-9.c  | 8 ++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/gcc/c/c-decl.cc b/gcc/c/c-decl.cc
index 1b53f2d0785..7dcb1141bf7 100644
--- a/gcc/c/c-decl.cc
+++ b/gcc/c/c-decl.cc
@@ -9587,8 +9587,11 @@ start_enum (location_t loc, struct c_enum_contents 
*the_enum, tree name,
 
   if (ENUM_FIXED_UNDERLYING_TYPE_P (enumtype)
       && fixed_underlying_type == NULL_TREE)
-    error_at (loc, "%<enum%> declared with but defined without "
-             "fixed underlying type");
+    {
+      error_at (loc, "%<enum%> declared with but defined without "
+               "fixed underlying type");
+      ENUM_FIXED_UNDERLYING_TYPE_P (enumtype) = false;
+    }
 
   the_enum->enum_next_value = integer_zero_node;
   the_enum->enum_type = enumtype;
diff --git a/gcc/testsuite/gcc.dg/c23-enum-10.c 
b/gcc/testsuite/gcc.dg/c23-enum-10.c
new file mode 100644
index 00000000000..894893133a5
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/c23-enum-10.c
@@ -0,0 +1,6 @@
+/* PR c/112571.  */
+/* { dg-do compile } */
+/* { dg-options "-std=c2x" } */
+
+enum X : typeof (enum X { A }); /* { dg-error "declared with but defined 
without fixed underlying type" } */
+/* { dg-error "invalid 'enum' underlying type" "invalid" { target *-*-* } .-1 
} */
diff --git a/gcc/testsuite/gcc.dg/c23-enum-9.c 
b/gcc/testsuite/gcc.dg/c23-enum-9.c
new file mode 100644
index 00000000000..b9a6afe0c77
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/c23-enum-9.c
@@ -0,0 +1,8 @@
+/* PR c/112571.  */
+/* { dg-do compile } */
+/* { dg-options "-std=c2x" } */
+
+enum h : typeof (enum h { D }) { D }; /* { dg-error "declared with but defined 
without fixed underlying type" } */
+/* { dg-error "invalid 'enum' underlying type" "invalid" { target *-*-* } .-1 
} */
+/* { dg-error "redeclaration of 'enum h'" "enumeration" { target *-*-* } .-2 } 
*/
+/* { dg-error "redeclaration of enumerator" "enumerator" { target *-*-* } .-3 
} */