diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/tree-ssa/pr86263.c | 29 | ||||
| -rw-r--r-- | gcc/tree-switch-conversion.c | 8 |
4 files changed, 46 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5c7c502..4401245 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2018-06-29 Martin Liska <mliska@suse.cz> + + PR tree-optimization/86263 + * tree-switch-conversion.c (switch_decision_tree::try_switch_expansion): + Make edge redirection. + 2018-06-29 David Malcolm <dmalcolm@redhat.com> * dumpfile.c (dump_loc): Add indentation based on scope depth. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 58860c7..a9f7fd9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-06-29 Martin Liska <mliska@suse.cz> + + PR tree-optimization/86263 + * gcc.dg/tree-ssa/pr86263.c: New test. + 2018-06-28 Carl Love <cel@us.ibm.com> * gcc.target/p9-extract-1.c: Add test case. diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr86263.c b/gcc/testsuite/gcc.dg/tree-ssa/pr86263.c new file mode 100644 index 0000000..7f80c22 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr86263.c @@ -0,0 +1,29 @@ +/* { dg-do compile } */ + +void f1 (void *); +void f2 (void *); +void f3 (void *); +void f4 (void *); + +char +_dcvt (void *ptr, char type, int opt, int val) +{ + switch (type) + { + case 'f': + f4 (ptr); + case 'F': + f1 (ptr); + break; + case 'g': + case 'G': + if (opt == 0) + opt = 1; + f2 (ptr); + break; + case 'e': + case 'E': + f3 (ptr); + } + return val; +} diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c index b79f2fd..4c9e7b9 100644 --- a/gcc/tree-switch-conversion.c +++ b/gcc/tree-switch-conversion.c @@ -1732,8 +1732,12 @@ switch_decision_tree::try_switch_expansion (vec<cluster *> &clusters) /* Do not do an extra work for a single cluster. */ if (clusters.length () == 1 && clusters[0]->get_type () != SIMPLE_CASE) - clusters[0]->emit (index_expr, index_type, - gimple_switch_default_label (m_switch), m_default_bb); + { + cluster *c = clusters[0]; + c->emit (index_expr, index_type, + gimple_switch_default_label (m_switch), m_default_bb); + redirect_edge_succ (single_succ_edge (bb), c->m_case_bb); + } else { emit (bb, index_expr, default_edge->probability, index_type); |