From 8f5ef6939f8b45c42a90d1b14d7e686c739aba5c Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Wed, 8 Jul 2015 11:54:28 +0000 Subject: [PATCH] re PR ipa/66793 (ICE at -Os and above on x86_64-linux-gnu (verify_flow_info failed)) 2015-07-08 Richard Biener PR tree-optimization/66793 * gimple-ssa-isolate-paths.c (insert_trap_and_remove_trailing_statemen): Properly split the block after stmts ending it. * gcc.dg/torture/pr66793.c: New testcase. From-SVN: r225546 --- gcc/ChangeLog | 6 ++++++ gcc/gimple-ssa-isolate-paths.c | 9 ++++++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/torture/pr66793.c | 26 ++++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr66793.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d3858096dea..421705dde5b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-07-08 Richard Biener + + PR tree-optimization/66793 + * gimple-ssa-isolate-paths.c (insert_trap_and_remove_trailing_statemen): + Properly split the block after stmts ending it. + 2015-07-08 Richard Biener PR tree-optimization/66794 diff --git a/gcc/gimple-ssa-isolate-paths.c b/gcc/gimple-ssa-isolate-paths.c index b437182be6d..d43b5ac5abf 100644 --- a/gcc/gimple-ssa-isolate-paths.c +++ b/gcc/gimple-ssa-isolate-paths.c @@ -103,7 +103,14 @@ insert_trap_and_remove_trailing_statements (gimple_stmt_iterator *si_p, tree op) if (walk_stmt_load_store_ops (stmt, (void *)op, check_loadstore, check_loadstore)) - gsi_insert_after (si_p, seq, GSI_NEW_STMT); + { + gsi_insert_after (si_p, seq, GSI_NEW_STMT); + if (stmt_ends_bb_p (stmt)) + { + split_block (gimple_bb (stmt), stmt); + return; + } + } else gsi_insert_before (si_p, seq, GSI_NEW_STMT); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7414562229f..f389f54cb06 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-07-08 Richard Biener + + PR tree-optimization/66793 + * gcc.dg/torture/pr66793.c: New testcase. + 2015-07-08 Richard Biener PR tree-optimization/66794 diff --git a/gcc/testsuite/gcc.dg/torture/pr66793.c b/gcc/testsuite/gcc.dg/torture/pr66793.c new file mode 100644 index 00000000000..3c9d5a2bb11 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr66793.c @@ -0,0 +1,26 @@ +/* { dg-do link } */ + +int a, b, c; + +struct S0 +{ + int f1; +} *d; + +void +fn1 (struct S0 p) +{ + for (p.f1 = 0; p.f1 < 1; p.f1++) + c = a && b ? a && b : 1; + for (; c;) + ; +} + +int +main () +{ + struct S0 **f = &d; + d = 0; + fn1 (**f); + return 0; +} -- 2.30.2