diff options
| author | Jan Hubicka <hubicka@ucw.cz> | 2017-07-03 14:42:07 +0200 |
|---|---|---|
| committer | Jan Hubicka <hubicka@gcc.gnu.org> | 2017-07-03 12:42:07 +0000 |
| commit | b5db8b44e55b6d95865c59e92779dc7dc2e3c273 (patch) | |
| tree | a28dda296bdd6460ef9fc637fbd48af72ecf5a5d /gcc/tree-cfg.c | |
| parent | edfe99a43c4c1b96132511c45c1cc0e627c4e1be (diff) | |
| download | gcc-b5db8b44e55b6d95865c59e92779dc7dc2e3c273.zip gcc-b5db8b44e55b6d95865c59e92779dc7dc2e3c273.tar.gz gcc-b5db8b44e55b6d95865c59e92779dc7dc2e3c273.tar.bz2 | |
tree-cfgcleanup.c (want_merge_blocks_p): New function.
* tree-cfgcleanup.c (want_merge_blocks_p): New function.
(cleanup_tree_cfg_bb): Use it.
* profile-count.h (profile_count::of_for_merging, profile_count::merge):
New functions.
* tree-cfg.c (gimple_merge_blocks): Use profile_count::merge.
From-SVN: r249907
Diffstat (limited to 'gcc/tree-cfg.c')
| -rw-r--r-- | gcc/tree-cfg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index 6add040..e0cee12 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -2076,7 +2076,7 @@ gimple_merge_blocks (basic_block a, basic_block b) profiles. */ if (a->loop_father == b->loop_father) { - a->count = MAX (a->count, b->count); + a->count = a->count.merge (b->count); a->frequency = MAX (a->frequency, b->frequency); } |