From 1315099e269d62f7a4abcb7f91abf78adbd168ec Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Tue, 4 Jul 2017 09:44:00 +0000 Subject: Save and restore EDGE_DFS_BACK in draw_cfg_edges 2017-07-04 Tom de Vries * graph.c (draw_cfg_edges): Save and restore EDGE_DFS_BACK. From-SVN: r249954 --- gcc/graph.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) (limited to 'gcc/graph.c') diff --git a/gcc/graph.c b/gcc/graph.c index d953fea0f56..9864120ff37 100644 --- a/gcc/graph.c +++ b/gcc/graph.c @@ -247,19 +247,42 @@ draw_cfg_nodes (pretty_printer *pp, struct function *fun) } /* Draw all edges in the CFG. Retreating edges are drawin as not - constraining, this makes the layout of the graph better. - (??? Calling mark_dfs_back may change the compiler's behavior when - dumping, but computing back edges here for ourselves is also not - desirable.) */ + constraining, this makes the layout of the graph better. */ static void draw_cfg_edges (pretty_printer *pp, struct function *fun) { basic_block bb; + + /* Save EDGE_DFS_BACK flag to dfs_back. */ + auto_bitmap dfs_back; + edge e; + edge_iterator ei; + unsigned int idx = 0; + FOR_EACH_BB_FN (bb, cfun) + FOR_EACH_EDGE (e, ei, bb->succs) + { + if (e->flags & EDGE_DFS_BACK) + bitmap_set_bit (dfs_back, idx); + idx++; + } + mark_dfs_back_edges (); FOR_ALL_BB_FN (bb, cfun) draw_cfg_node_succ_edges (pp, fun->funcdef_no, bb); + /* Restore EDGE_DFS_BACK flag from dfs_back. */ + idx = 0; + FOR_EACH_BB_FN (bb, cfun) + FOR_EACH_EDGE (e, ei, bb->succs) + { + if (bitmap_bit_p (dfs_back, idx)) + e->flags |= EDGE_DFS_BACK; + else + e->flags &= ~EDGE_DFS_BACK; + idx++; + } + /* Add an invisible edge from ENTRY to EXIT, to improve the graph layout. */ pp_printf (pp, "\tfn_%d_basic_block_%d:s -> fn_%d_basic_block_%d:n " -- cgit v1.2.3