public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-5249] c: ICE with nullptr as case expression [PR108424]
@ 2023-01-18 21:50 Marek Polacek
  0 siblings, 0 replies; only message in thread
From: Marek Polacek @ 2023-01-18 21:50 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:0f85ae6591c92b161693073c0931c7ca1d5d0c5a

commit r13-5249-g0f85ae6591c92b161693073c0931c7ca1d5d0c5a
Author: Marek Polacek <polacek@redhat.com>
Date:   Wed Jan 18 14:51:59 2023 -0500

    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.

Diff:
---
 gcc/c-family/c-common.cc             |  3 ++-
 gcc/testsuite/gcc.dg/c2x-nullptr-6.c | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/gcc/c-family/c-common.cc b/gcc/c-family/c-common.cc
index 76c8abef296..ae92cd5adaf 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 00000000000..24e14fa6921
--- /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:
+  }
+}

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-01-18 21:50 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-18 21:50 [gcc r13-5249] c: ICE with nullptr as case expression [PR108424] Marek Polacek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).