From 7e8c8abc9974707605cd422ff13bc6d5dd264986 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 4 Nov 2013 21:17:17 +0100 Subject: [PATCH] re PR tree-optimization/58978 (ICE: Segmentation fault) PR tree-optimization/58978 * tree-vrp.c (all_imm_uses_in_stmt_or_feed_cond): Don't modify use_stmt by single_imm_use directly. Only call single_imm_use on SSA_NAMEs. * gcc.c-torture/compile/pr58978.c: New test. From-SVN: r204357 --- gcc/ChangeLog | 7 +++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.c-torture/compile/pr58978.c | 16 ++++++++++++++++ gcc/tree-vrp.c | 7 ++++--- 4 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr58978.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7e0b752c3ed..c18cbb7b659 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2013-11-04 Jakub Jelinek + + PR tree-optimization/58978 + * tree-vrp.c (all_imm_uses_in_stmt_or_feed_cond): Don't modify + use_stmt by single_imm_use directly. Only call single_imm_use + on SSA_NAMEs. + 2013-11-04 Vladimir Makarov PR rtl-optimization/58968 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 43813fbd96d..7b36e1b71dd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-11-04 Jakub Jelinek + + PR tree-optimization/58978 + * gcc.c-torture/compile/pr58978.c: New test. + 2013-11-04 Paul Thomas PR fortran/57445 diff --git a/gcc/testsuite/gcc.c-torture/compile/pr58978.c b/gcc/testsuite/gcc.c-torture/compile/pr58978.c new file mode 100644 index 00000000000..721801da16b --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr58978.c @@ -0,0 +1,16 @@ +/* PR tree-optimization/58978 */ + +int +foo (int x) +{ + switch (x) + { + case 0: + case 1: + case 9: + break; + default: + __builtin_unreachable (); + } + return x; +} diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c index 15cfcb3f591..b74bed33811 100644 --- a/gcc/tree-vrp.c +++ b/gcc/tree-vrp.c @@ -6472,13 +6472,14 @@ all_imm_uses_in_stmt_or_feed_cond (tree var, gimple stmt, basic_block cond_bb) FOR_EACH_IMM_USE_FAST (use_p, iter, var) if (USE_STMT (use_p) != stmt) { - gimple use_stmt = USE_STMT (use_p); + gimple use_stmt = USE_STMT (use_p), use_stmt2; if (is_gimple_debug (use_stmt)) continue; while (is_gimple_assign (use_stmt) + && TREE_CODE (gimple_assign_lhs (use_stmt)) == SSA_NAME && single_imm_use (gimple_assign_lhs (use_stmt), - &use2_p, &use_stmt)) - ; + &use2_p, &use_stmt2)) + use_stmt = use_stmt2; if (gimple_code (use_stmt) != GIMPLE_COND || gimple_bb (use_stmt) != cond_bb) return false; -- 2.30.2