Fix IPA profile merging, fixed in trunk with r253910.

2018-03-07  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.

From-SVN: r258326

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1b451894b3f520a7b3b90c879c48781644cdc6f8..ea0a7dcd912e662de48be494eac81ccc4f6168d2 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2018-03-07  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-07  Martin Liska  <mliska@suse.cz>
 
        Backport from mainline

diff --git a/gcc/ipa-utils.c b/gcc/ipa-utils.c
index 5eb7d5f31aad5fc46f7f8e23e1330453a356b904..cee0c6c95d0e55d7a715dbcc540d79ab0bb8758f 100644 (file)
--- 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",