From 48ff1d417d4c49525c09b013395e38dda8bd50fe Mon Sep 17 00:00:00 2001 From: bstarynk Date: Sat, 4 Jan 2014 17:57:29 +0000 Subject: 2014-01-04 Basile Starynkevitch {{merge using svnmerge.py with trunk GCC 4.9 svn rev206333 now in stage 3; very unstable, xtramelt-ana-base don't compile anymore...}} git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@206336 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/graph.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gcc/graph.c') diff --git a/gcc/graph.c b/gcc/graph.c index b75135af742..f95a525e9a9 100644 --- a/gcc/graph.c +++ b/gcc/graph.c @@ -1,5 +1,5 @@ /* Output routines for graphical representation. - Copyright (C) 1998-2013 Free Software Foundation, Inc. + Copyright (C) 1998-2014 Free Software Foundation, Inc. Contributed by Ulrich Drepper , 1998. Rewritten for DOT output by Steven Bosscher, 2012. @@ -157,14 +157,14 @@ draw_cfg_nodes_no_loops (pretty_printer *pp, struct function *fun) int i, n; sbitmap visited; - visited = sbitmap_alloc (last_basic_block); + visited = sbitmap_alloc (last_basic_block_for_fn (cfun)); bitmap_clear (visited); n = pre_and_rev_post_order_compute_fn (fun, NULL, rpo, true); for (i = n_basic_blocks_for_fn (fun) - n; i < n_basic_blocks_for_fn (fun); i++) { - basic_block bb = BASIC_BLOCK (rpo[i]); + basic_block bb = BASIC_BLOCK_FOR_FN (cfun, rpo[i]); draw_cfg_node (pp, fun->funcdef_no, bb); bitmap_set_bit (visited, bb->index); } @@ -255,7 +255,7 @@ draw_cfg_edges (pretty_printer *pp, struct function *fun) { basic_block bb; mark_dfs_back_edges (); - FOR_ALL_BB (bb) + FOR_ALL_BB_FN (bb, cfun) draw_cfg_node_succ_edges (pp, fun->funcdef_no, bb); /* Add an invisible edge from ENTRY to EXIT, to improve the graph layout. */ -- cgit v1.2.1