From d44d45d7b3ecee2fbec1a0e64ea71fcaa7466e45 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Wed, 7 Mar 2018 10:46:50 +0100 Subject: [PATCH] Fix IPA profile merging, fixed in trunk with r253910. 2018-03-07 Martin Liska Backport from mainline 2018-03-05 Martin Liska * ipa-utils.c (ipa_merge_profiles): Do not merge alias or a function without profile. From-SVN: r258326 --- gcc/ChangeLog | 8 ++++++++ gcc/ipa-utils.c | 2 ++ 2 files changed, 10 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1b451894b3f5..ea0a7dcd912e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2018-03-07 Martin Liska + + Backport from mainline + 2018-03-05 Martin Liska + + * ipa-utils.c (ipa_merge_profiles): Do not merge alias or + a function without profile. + 2018-03-07 Martin Liska Backport from mainline diff --git a/gcc/ipa-utils.c b/gcc/ipa-utils.c index 5eb7d5f31aad..cee0c6c95d0e 100644 --- a/gcc/ipa-utils.c +++ b/gcc/ipa-utils.c @@ -403,6 +403,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", -- 2.47.2