diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2016-12-12 23:02:52 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2016-12-12 23:02:52 +0100 |
| commit | 1697df8c99b5b5d0252c7c26113f16f0d0c87c1b (patch) | |
| tree | 804190b7b83c8a1f184990fb9350a40ad0146095 /gcc | |
| parent | 27ec22668ffe96569b1860008e398d29f08ebd6c (diff) | |
| download | gcc-1697df8c99b5b5d0252c7c26113f16f0d0c87c1b.zip gcc-1697df8c99b5b5d0252c7c26113f16f0d0c87c1b.tar.gz gcc-1697df8c99b5b5d0252c7c26113f16f0d0c87c1b.tar.bz2 | |
re PR tree-optimization/78777 (ICE in mark_reachable_handlers, at tree-eh.c:3823 (aarch64-linux-gnu))
PR tree-optimization/78777
* gimple-ssa-strength-reduction.c (create_add_on_incoming_edge,
insert_initializers): Use stmt_ends_bb_p instead of is_ctrl_stmt.
* g++.dg/torture/pr78777.C: New test.
From-SVN: r243584
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/gimple-ssa-strength-reduction.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/torture/pr78777.C | 29 |
4 files changed, 40 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 50a9cf7..95e8966 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2016-12-12 Jakub Jelinek <jakub@redhat.com> + PR tree-optimization/78777 + * gimple-ssa-strength-reduction.c (create_add_on_incoming_edge, + insert_initializers): Use stmt_ends_bb_p instead of is_ctrl_stmt. + PR other/78766 * opt-functions.awk (opt_args): Use [{] instead of { in regexps. Formatting fix. diff --git a/gcc/gimple-ssa-strength-reduction.c b/gcc/gimple-ssa-strength-reduction.c index 21dcbb0..ba82a20 100644 --- a/gcc/gimple-ssa-strength-reduction.c +++ b/gcc/gimple-ssa-strength-reduction.c @@ -2253,7 +2253,7 @@ create_add_on_incoming_edge (slsr_cand_t c, tree basis_name, insert_bb = single_succ_p (e->src) ? e->src : split_edge (e); gsi = gsi_last_bb (insert_bb); - if (!gsi_end_p (gsi) && is_ctrl_stmt (gsi_stmt (gsi))) + if (!gsi_end_p (gsi) && stmt_ends_bb_p (gsi_stmt (gsi))) { gsi_insert_before (&gsi, new_stmt, GSI_SAME_STMT); if (cast_stmt) @@ -3243,7 +3243,7 @@ insert_initializers (slsr_cand_t c) gimple *basis_stmt = lookup_cand (c->basis)->cand_stmt; location_t loc = gimple_location (basis_stmt); - if (!gsi_end_p (gsi) && is_ctrl_stmt (gsi_stmt (gsi))) + if (!gsi_end_p (gsi) && stmt_ends_bb_p (gsi_stmt (gsi))) { if (cast_stmt) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 71a6e2a..b4eea72 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-12-12 Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/78777 + * g++.dg/torture/pr78777.C: New test. + 2016-12-12 Martin Sebor <msebor@redhat.com> PR middle-end/78622 diff --git a/gcc/testsuite/g++.dg/torture/pr78777.C b/gcc/testsuite/g++.dg/torture/pr78777.C new file mode 100644 index 0000000..451289e --- /dev/null +++ b/gcc/testsuite/g++.dg/torture/pr78777.C @@ -0,0 +1,29 @@ +// PR tree-optimization/78777 + +void bar (char); +struct C { char b; }; +struct H { char d[5]; int e; C *f[4]; int g[10]; }; +void baz (C *, unsigned char *, int); +unsigned char j[10]; + +void +foo (H *o, int p, unsigned char *q, int r, char n, H *b) +{ + for (int m = 0; m < o->e; m++) + { + if (o->f[m] || o->g[m]) + continue; + try + { + baz (o->f[m], j, 5); + if (p) + baz (o->f[m], q, r); + } + catch (int) + { + C a = *o->f[m]; + if (b) + bar (n & a.b); + } + } +} |