aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2018-09-05 13:28:49 +0200
committerMartin Liska <marxin@gcc.gnu.org>2018-09-05 11:28:49 +0000
commite6c5d9f0f586b303a4d292b42e1e8d705651f86c (patch)
tree1b7c60da9489ea13350cf717f48e317704be88d9 /gcc
parent85004cb2dcc43010001d6231cf6aca6eb769d2c3 (diff)
downloadgcc-e6c5d9f0f586b303a4d292b42e1e8d705651f86c.zip
gcc-e6c5d9f0f586b303a4d292b42e1e8d705651f86c.tar.gz
gcc-e6c5d9f0f586b303a4d292b42e1e8d705651f86c.tar.bz2
Group switch cases in switch lowering (PR tree-optimization/87205).
2018-09-05 Martin Liska <mliska@suse.cz> PR tree-optimization/87205 * tree-switch-conversion.c (pass_lower_switch::execute): Group cases for switch statements. 2018-09-05 Martin Liska <mliska@suse.cz> PR tree-optimization/87205 * gcc.dg/tree-ssa/pr87205-2.c: New test. * gcc.dg/tree-ssa/pr87205.c: New test. From-SVN: r264124
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/testsuite/ChangeLog6
-rw-r--r--gcc/testsuite/gcc.dg/tree-ssa/pr87205-2.c18
-rw-r--r--gcc/testsuite/gcc.dg/tree-ssa/pr87205.c21
-rw-r--r--gcc/tree-switch-conversion.c9
5 files changed, 58 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 47bc612..8386829 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-09-05 Martin Liska <mliska@suse.cz>
+
+ PR tree-optimization/87205
+ * tree-switch-conversion.c (pass_lower_switch::execute):
+ Group cases for switch statements.
+
2018-09-05 Richard Biener <rguenther@suse.de>
PR tree-optimization/87217
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 12bb8a2..fc40df0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-09-05 Martin Liska <mliska@suse.cz>
+
+ PR tree-optimization/87205
+ * gcc.dg/tree-ssa/pr87205-2.c: New test.
+ * gcc.dg/tree-ssa/pr87205.c: New test.
+
2018-09-05 Richard Biener <rguenther@suse.de>
PR tree-optimization/87217
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr87205-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr87205-2.c
new file mode 100644
index 0000000..fb1879e
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr87205-2.c
@@ -0,0 +1,18 @@
+/* { dg-options "-O2 -fdump-tree-optimized" } */
+
+void f(int);
+void h(unsigned i)
+{
+ switch (i) {
+ default: __builtin_unreachable();
+ case 0: f(42); break;
+ case 1: f(42); break;
+ case 2: f(42); break;
+ case 3: f(42); break;
+ case 4: f(42); break;
+ case 5: f(42); break;
+ }
+}
+
+/* { dg-final { scan-tree-dump-not "if" "optimized" } } */
+/* { dg-final { scan-tree-dump-not "switch" "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr87205.c b/gcc/testsuite/gcc.dg/tree-ssa/pr87205.c
new file mode 100644
index 0000000..129e607
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr87205.c
@@ -0,0 +1,21 @@
+/* { dg-options "-O2 -fdump-tree-optimized" } */
+
+void f( int x );
+
+void h( unsigned ix )
+{
+ switch( ix )
+ {
+ case 0: f(42); break;
+ case 1: f(42); break;
+ case 2: f(42); break;
+ case 3: f(42); break;
+ case 4: f(42); break;
+ case 5: f(42); break;
+ default: __builtin_unreachable();
+ }
+}
+
+
+/* { dg-final { scan-tree-dump-not "if" "optimized" } } */
+/* { dg-final { scan-tree-dump-not "switch" "optimized" } } */
diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c
index 1f543b2..64169a6 100644
--- a/gcc/tree-switch-conversion.c
+++ b/gcc/tree-switch-conversion.c
@@ -2419,8 +2419,13 @@ pass_lower_switch<O0>::execute (function *fun)
FOR_EACH_BB_FN (bb, fun)
{
gimple *stmt = last_stmt (bb);
- if (stmt && gimple_code (stmt) == GIMPLE_SWITCH)
- switch_statements.safe_push (stmt);
+ gswitch *swtch;
+ if (stmt && (swtch = dyn_cast<gswitch *> (stmt)))
+ {
+ if (!O0)
+ group_case_labels_stmt (swtch);
+ switch_statements.safe_push (swtch);
+ }
}
for (unsigned i = 0; i < switch_statements.length (); i++)