diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-01-04 17:57:29 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-01-04 17:57:29 +0000 |
| commit | 48ff1d417d4c49525c09b013395e38dda8bd50fe (patch) | |
| tree | ffb4ea05f14bc936b5dd3681e19b2aa3cee8c3bf /gcc/cfghooks.c | |
| parent | 144409bbbdb293946cea105115e0e329f633d333 (diff) | |
| download | gcc-48ff1d417d4c49525c09b013395e38dda8bd50fe.tar.gz | |
2014-01-04 Basile Starynkevitch <basile@starynkevitch.net>
{{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
Diffstat (limited to 'gcc/cfghooks.c')
| -rw-r--r-- | gcc/cfghooks.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gcc/cfghooks.c b/gcc/cfghooks.c index 2535c9027be..7cf3cd50a66 100644 --- a/gcc/cfghooks.c +++ b/gcc/cfghooks.c @@ -1,5 +1,5 @@ /* Hooks for cfg representation specific functions. - Copyright (C) 2003-2013 Free Software Foundation, Inc. + Copyright (C) 2003-2014 Free Software Foundation, Inc. Contributed by Sebastian Pop <s.pop@laposte.net> This file is part of GCC. @@ -98,15 +98,15 @@ verify_flow_info (void) basic_block *last_visited; timevar_push (TV_CFG_VERIFY); - last_visited = XCNEWVEC (basic_block, last_basic_block); - edge_checksum = XCNEWVEC (size_t, last_basic_block); + last_visited = XCNEWVEC (basic_block, last_basic_block_for_fn (cfun)); + edge_checksum = XCNEWVEC (size_t, last_basic_block_for_fn (cfun)); /* Check bb chain & numbers. */ last_bb_seen = ENTRY_BLOCK_PTR_FOR_FN (cfun); FOR_BB_BETWEEN (bb, ENTRY_BLOCK_PTR_FOR_FN (cfun)->next_bb, NULL, next_bb) { if (bb != EXIT_BLOCK_PTR_FOR_FN (cfun) - && bb != BASIC_BLOCK (bb->index)) + && bb != BASIC_BLOCK_FOR_FN (cfun, bb->index)) { error ("bb %d on wrong place", bb->index); err = 1; @@ -123,7 +123,7 @@ verify_flow_info (void) } /* Now check the basic blocks (boundaries etc.) */ - FOR_EACH_BB_REVERSE (bb) + FOR_EACH_BB_REVERSE_FN (bb, cfun) { int n_fallthru = 0; edge e; @@ -325,7 +325,7 @@ dump_flow_info (FILE *file, int flags) fprintf (file, "\n%d basic blocks, %d edges.\n", n_basic_blocks_for_fn (cfun), n_edges_for_fn (cfun)); - FOR_ALL_BB (bb) + FOR_ALL_BB_FN (bb, cfun) dump_bb (file, bb, 0, flags); putc ('\n', file); @@ -1408,10 +1408,10 @@ account_profile_record (struct profile_record *record, int after_pass) int sum; gcov_type lsum; - FOR_ALL_BB (bb) + FOR_ALL_BB_FN (bb, cfun) { if (bb != EXIT_BLOCK_PTR_FOR_FN (cfun) - && profile_status != PROFILE_ABSENT) + && profile_status_for_fn (cfun) != PROFILE_ABSENT) { sum = 0; FOR_EACH_EDGE (e, ei, bb->succs) @@ -1426,7 +1426,7 @@ account_profile_record (struct profile_record *record, int after_pass) record->num_mismatched_count_out[after_pass]++; } if (bb != ENTRY_BLOCK_PTR_FOR_FN (cfun) - && profile_status != PROFILE_ABSENT) + && profile_status_for_fn (cfun) != PROFILE_ABSENT) { sum = 0; FOR_EACH_EDGE (e, ei, bb->preds) |