diff options
| author | marxin <marxin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-03-06 20:05:36 +0000 |
|---|---|---|
| committer | marxin <marxin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-03-06 20:05:36 +0000 |
| commit | 33d6b1662b89925db48063db97f3aefa452ac01e (patch) | |
| tree | a504eb9a9fb868c98d3b9da3fa989884b9d37e5a | |
| parent | 9bb0081e39b5e12f1bdc263bd52e98d00040b8f3 (diff) | |
| download | gcc-33d6b1662b89925db48063db97f3aefa452ac01e.tar.gz | |
Fix IPA profile merging, fixed in trunk with r253910.
2018-03-06 Martin Liska <mliska@suse.cz>
Backport from mainline
2018-03-05 Martin Liska <mliska@suse.cz>
* ipa-utils.c (ipa_merge_profiles): Do not merge alias or
a function without profile.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@258292 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/ipa-utils.c | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 31609c64c32..b4db741465a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,14 @@ 2018-03-06 Martin Liska <mliska@suse.cz> Backport from mainline + 2018-03-05 Martin Liska <mliska@suse.cz> + + * ipa-utils.c (ipa_merge_profiles): Do not merge alias or + a function without profile. + +2018-03-06 Martin Liska <mliska@suse.cz> + + Backport from mainline 2018-02-21 Jan Hubicka <hubicka@ucw.cz> PR c/84229 diff --git a/gcc/ipa-utils.c b/gcc/ipa-utils.c index 959e31a68e6..f7dd29f925c 100644 --- a/gcc/ipa-utils.c +++ b/gcc/ipa-utils.c @@ -404,6 +404,8 @@ ipa_merge_profiles (struct cgraph_node *dst, if (!dst->count) return; + if (!src->count || src->alias) + return; if (symtab->dump_file) { fprintf (symtab->dump_file, "Merging profiles of %s/%i to %s/%i\n", |