With SVE we can end up with:
switch (POLY_INT_CST [2, 2]) <default: <L2> [INV], case 2: <L3> [INV], case 4: 
<L3> [INV]>
which is fine to expand and we can remove the assert.

Ready to be installed?
Thanks,
Martin

gcc/ChangeLog:

        PR tree-optimization/96915
        * tree-switch-conversion.c (switch_conversion::expand): Accept
        also integer constants.

gcc/testsuite/ChangeLog:

        PR tree-optimization/96915
        * gcc.target/aarch64/sve/pr96915.c: New test.
---
 gcc/testsuite/gcc.target/aarch64/sve/pr96915.c | 11 +++++++++++
 gcc/tree-switch-conversion.c                   |  3 ---
 2 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 gcc/testsuite/gcc.target/aarch64/sve/pr96915.c

diff --git a/gcc/testsuite/gcc.target/aarch64/sve/pr96915.c 
b/gcc/testsuite/gcc.target/aarch64/sve/pr96915.c
new file mode 100644
index 00000000000..fae4cd42117
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/sve/pr96915.c
@@ -0,0 +1,11 @@
+/* PR tree-optimization/96915 */
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=armv8.2-a+sve" } */
+
+#pragma GCC aarch64 "arm_sve.h"
+void b() {
+  switch (svcntd())
+  case 2:
+  case 4:
+    b();
+}
diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c
index 4b435941d12..186411ff3c4 100644
--- a/gcc/tree-switch-conversion.c
+++ b/gcc/tree-switch-conversion.c
@@ -984,9 +984,6 @@ switch_conversion::expand (gswitch *swtch)
      during gimplification).  */
   gcc_checking_assert (TREE_TYPE (m_index_expr) != error_mark_node);
- /* A switch on a constant should have been optimized in tree-cfg-cleanup. */
-  gcc_checking_assert (!TREE_CONSTANT (m_index_expr));
-
   /* Prefer bit test if possible.  */
   if (tree_fits_uhwi_p (m_range_size)
       && bit_test_cluster::can_be_handled (tree_to_uhwi (m_range_size), m_uniq)
--
2.28.0

Reply via email to