From: Jakub Jelinek Date: Fri, 5 Jan 2018 08:51:32 +0000 (+0100) Subject: re PR tree-optimization/83605 (ICE: verify_gimple failed (error: dead STMT in EH... X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bef52a6895ddb01d4b349f2f43b8ab0cd99fa3be;p=gcc.git re PR tree-optimization/83605 (ICE: verify_gimple failed (error: dead STMT in EH table)) PR tree-optimization/83605 * gimple-ssa-strength-reduction.c: Include tree-eh.h. (find_candidates_dom_walker::before_dom_children): Ignore stmts that can throw. * gcc.dg/pr83605.c: New test. From-SVN: r256274 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1fcf203c2ef..14cd939eb3f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2018-01-05 Jakub Jelinek + + PR tree-optimization/83605 + * gimple-ssa-strength-reduction.c: Include tree-eh.h. + (find_candidates_dom_walker::before_dom_children): Ignore stmts that + can throw. + 2018-01-05 Sebastian Huber * config.gcc (epiphany-*-elf*): Add (epiphany-*-rtems*) configuration. diff --git a/gcc/gimple-ssa-strength-reduction.c b/gcc/gimple-ssa-strength-reduction.c index 521d7e942f3..1c00f094db8 100644 --- a/gcc/gimple-ssa-strength-reduction.c +++ b/gcc/gimple-ssa-strength-reduction.c @@ -55,6 +55,7 @@ along with GCC; see the file COPYING3. If not see #include "params.h" #include "tree-ssa-address.h" #include "tree-affine.h" +#include "tree-eh.h" #include "builtins.h" /* Information about a strength reduction candidate. Each statement @@ -1747,6 +1748,9 @@ find_candidates_dom_walker::before_dom_children (basic_block bb) { gimple *gs = gsi_stmt (gsi); + if (stmt_could_throw_p (gs)) + continue; + if (gimple_vuse (gs) && gimple_assign_single_p (gs)) slsr_process_ref (gs); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 90f4d5740c5..990cefa3452 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-01-05 Jakub Jelinek + + PR tree-optimization/83605 + * gcc.dg/pr83605.c: New test. + 2018-01-04 Jakub Jelinek PR target/83554 diff --git a/gcc/testsuite/gcc.dg/pr83605.c b/gcc/testsuite/gcc.dg/pr83605.c new file mode 100644 index 00000000000..c680f0ce91f --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr83605.c @@ -0,0 +1,20 @@ +/* PR tree-optimization/83605 */ +/* { dg-do compile } */ +/* { dg-options "-O1 -ftrapv -fexceptions -fnon-call-exceptions" } */ + +int a; + +int +foo (int x) +{ + int b = a; + { + int c; + int *d = (x == 0) ? &c : &b; + + for (a = 0; a < 2; ++a) + c = (x + b) < a; + + return *d; + } +}