[C] Fix ICE for composite type for structs with unsigned bitfields [PR113492]

Message ID 75930f8a30c3de6c45988fb0f8762ef07cad23a9.camel@tugraz.at
State Accepted
Headers
Series [C] Fix ICE for composite type for structs with unsigned bitfields [PR113492] |

Checks

Context Check Description
snail/gcc-patch-check success Github commit url

Commit Message

Martin Uecker Jan. 20, 2024, 6:37 p.m. UTC
  C23: Fix ICE for composite type for structs with unsigned bitfields [PR113492]
    
This patch fixes a bug when forming a composite type from structs that
contain an unsigned bitfield declared with int while using -funsigned-bitfields.
In such structs the unsigned integer type was not compatible to the
regular unsigned integer type used elsewhere in the C FE.
    
	PR c/113492

gcc/c:
	* c-decl.cc (grokdeclarator): Use c_common_unsigned_type instead of
 	unsigned_type_for to create the unsigned type for bitfields declared
	with int when using -funsigned-bitfields.
    
gcc/testsuite:
	* gcc.dg/pr113492.c: New test.
  

Comments

Joseph Myers Jan. 20, 2024, 11:36 p.m. UTC | #1
On Sat, 20 Jan 2024, Martin Uecker wrote:

> C23: Fix ICE for composite type for structs with unsigned bitfields [PR113492]
>     
> This patch fixes a bug when forming a composite type from structs that
> contain an unsigned bitfield declared with int while using -funsigned-bitfields.
> In such structs the unsigned integer type was not compatible to the
> regular unsigned integer type used elsewhere in the C FE.
>     
> 	PR c/113492
> 
> gcc/c:
> 	* c-decl.cc (grokdeclarator): Use c_common_unsigned_type instead of
>  	unsigned_type_for to create the unsigned type for bitfields declared
> 	with int when using -funsigned-bitfields.
>     
> gcc/testsuite:
> 	* gcc.dg/pr113492.c: New test.

OK.
  

Patch

diff --git a/gcc/c/c-decl.cc b/gcc/c/c-decl.cc
index 4029bbc59fe..8d18a3e11f4 100644
--- a/gcc/c/c-decl.cc
+++ b/gcc/c/c-decl.cc
@@ -6947,7 +6947,7 @@  grokdeclarator (const struct c_declarator *declarator,
      "signed".  */
   if (bitfield && !flag_signed_bitfields && !declspecs->explicit_signed_p
       && TREE_CODE (type) == INTEGER_TYPE)
-    type = unsigned_type_for (type);
+    type = c_common_unsigned_type (type);
 
   /* Figure out the type qualifiers for the declaration.  There are
      two ways a declaration can become qualified.  One is something
diff --git a/gcc/testsuite/gcc.dg/pr113492.c b/gcc/testsuite/gcc.dg/pr113492.c
new file mode 100644
index 00000000000..56296c51072
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr113492.c
@@ -0,0 +1,43 @@ 
+/* PR 113492
+ * { dg-do compile }
+ * { dg-options "-std=c23 -funsigned-bitfields" } */
+
+struct foo {
+	int i : 3;
+} i;
+
+void test()
+{
+	struct foo {
+		unsigned i : 3;
+	} u;
+
+	1 ? i : u;
+	1 ? u : i;
+}
+	
+struct bar {
+	unsigned i : 3;
+} u;
+
+void test2()
+{
+	struct bar {
+		int i : 3;
+	} i;
+
+	1 ? i : u;
+	1 ? u : i;
+}
+	
+void test3()
+{
+	typedef int myint;
+	struct bar {
+		myint i : 3;
+	} i;
+
+	1 ? i : u;
+	1 ? u : i;
+}
+