aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMarek Polacek <polacek@redhat.com>2023-01-18 14:51:59 -0500
committerMarek Polacek <polacek@redhat.com>2023-01-18 16:49:57 -0500
commit0f85ae6591c92b161693073c0931c7ca1d5d0c5a (patch)
treeccbdeeb12858685e825db52f7c7f9e27d418d0df /gcc
parent33237e93d59ee7bb215cd5b726880bcbd679bb36 (diff)
downloadgcc-0f85ae6591c92b161693073c0931c7ca1d5d0c5a.zip
gcc-0f85ae6591c92b161693073c0931c7ca1d5d0c5a.tar.gz
gcc-0f85ae6591c92b161693073c0931c7ca1d5d0c5a.tar.bz2
c: ICE with nullptr as case expression [PR108424]
In this ICE-on-invalid, we crash on gcc_assert (INTEGRAL_TYPE_P (type)); in perform_integral_promotions, because a nullptr is an INTEGER_CST, but not INTEGRAL_TYPE_P, and check_case_value is only checking the former. In the test I'm testing other "shall be an integral constant expression" contexts as well. PR c/108424 gcc/c-family/ChangeLog: * c-common.cc (check_case_value): Check INTEGRAL_TYPE_P. gcc/testsuite/ChangeLog: * gcc.dg/c2x-nullptr-6.c: New test.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/c-family/c-common.cc3
-rw-r--r--gcc/testsuite/gcc.dg/c2x-nullptr-6.c33
2 files changed, 35 insertions, 1 deletions
diff --git a/gcc/c-family/c-common.cc b/gcc/c-family/c-common.cc
index 76c8abe..ae92cd5 100644
--- a/gcc/c-family/c-common.cc
+++ b/gcc/c-family/c-common.cc
@@ -2238,7 +2238,8 @@ check_case_value (location_t loc, tree value)
if (value == NULL_TREE)
return value;
- if (TREE_CODE (value) == INTEGER_CST)
+ if (INTEGRAL_TYPE_P (TREE_TYPE (value))
+ && TREE_CODE (value) == INTEGER_CST)
/* Promote char or short to int. */
value = perform_integral_promotions (value);
else if (value != error_mark_node)
diff --git a/gcc/testsuite/gcc.dg/c2x-nullptr-6.c b/gcc/testsuite/gcc.dg/c2x-nullptr-6.c
new file mode 100644
index 0000000..24e14fa
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/c2x-nullptr-6.c
@@ -0,0 +1,33 @@
+/* PR c/108424 */
+/* { dg-options "-std=c2x" } */
+
+struct S {
+ int i;
+ int : nullptr; /* { dg-error "not an integer constant" } */
+};
+
+enum E { X = nullptr }; /* { dg-error "not an integer constant" } */
+
+alignas(nullptr) int g; /* { dg-error "not an integer constant" } */
+
+int arr[10] = { [nullptr] = 1 }; /* { dg-error "not of integer type" } */
+
+_Static_assert (nullptr, "nullptr"); /* { dg-error "not an integer" } */
+
+void f (int n)
+{
+ switch (n) {
+ case nullptr: /* { dg-error "an integer constant" } */
+ default:
+ }
+
+ switch (n) {
+ case 1 ... nullptr: /* { dg-error "an integer constant" } */
+ default:
+ }
+
+ switch (n) {
+ case nullptr ... 2: /* { dg-error "an integer constant" } */
+ default:
+ }
+}