diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2015-12-15 08:46:23 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2015-12-15 08:46:23 +0100 |
| commit | 3be33b6eacc702052999b851cc2a8bee97cec47f (patch) | |
| tree | 053148663998d24f5a8549a720787932ed33c901 /gcc/tree-cfgcleanup.c | |
| parent | 3ce38f68f93279b193ecb91cdc3635db6f9c810f (diff) | |
| download | gcc-3be33b6eacc702052999b851cc2a8bee97cec47f.zip gcc-3be33b6eacc702052999b851cc2a8bee97cec47f.tar.gz gcc-3be33b6eacc702052999b851cc2a8bee97cec47f.tar.bz2 | |
re PR debug/66688 (compare debug failure building Linux kernel on ppc64le)
PR tree-optimization/66688
* tree-cfgcleanup.c (cleanup_control_flow_bb): Handle
noreturn call followed only by debug stmts by removing
the debug stmts and handling it the same as if the noreturn
call is the last stmt.
* gcc.dg/pr66688.c: New test.
From-SVN: r231644
Diffstat (limited to 'gcc/tree-cfgcleanup.c')
| -rw-r--r-- | gcc/tree-cfgcleanup.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/gcc/tree-cfgcleanup.c b/gcc/tree-cfgcleanup.c index 40ad5ca..3f50c66 100644 --- a/gcc/tree-cfgcleanup.c +++ b/gcc/tree-cfgcleanup.c @@ -186,7 +186,7 @@ cleanup_control_flow_bb (basic_block bb) we need to prune cfg. */ retval |= gimple_purge_dead_eh_edges (bb); - gsi = gsi_last_bb (bb); + gsi = gsi_last_nondebug_bb (bb); if (gsi_end_p (gsi)) return retval; @@ -197,7 +197,10 @@ cleanup_control_flow_bb (basic_block bb) if (gimple_code (stmt) == GIMPLE_COND || gimple_code (stmt) == GIMPLE_SWITCH) - retval |= cleanup_control_expr_graph (bb, gsi); + { + gcc_checking_assert (gsi_stmt (gsi_last_bb (bb)) == stmt); + retval |= cleanup_control_expr_graph (bb, gsi); + } else if (gimple_code (stmt) == GIMPLE_GOTO && TREE_CODE (gimple_goto_dest (stmt)) == ADDR_EXPR && (TREE_CODE (TREE_OPERAND (gimple_goto_dest (stmt), 0)) @@ -210,6 +213,7 @@ cleanup_control_flow_bb (basic_block bb) edge_iterator ei; basic_block target_block; + gcc_checking_assert (gsi_stmt (gsi_last_bb (bb)) == stmt); /* First look at all the outgoing edges. Delete any outgoing edges which do not go to the right block. For the one edge which goes to the right block, fix up its flags. */ @@ -242,9 +246,15 @@ cleanup_control_flow_bb (basic_block bb) /* Check for indirect calls that have been turned into noreturn calls. */ else if (is_gimple_call (stmt) - && gimple_call_noreturn_p (stmt) - && remove_fallthru_edge (bb->succs)) - retval = true; + && gimple_call_noreturn_p (stmt)) + { + /* If there are debug stmts after the noreturn call, remove them + now, they should be all unreachable anyway. */ + for (gsi_next (&gsi); !gsi_end_p (gsi); ) + gsi_remove (&gsi, true); + if (remove_fallthru_edge (bb->succs)) + retval = true; + } return retval; } |