From: Martin Liska <mliska@suse.cz>
Date: Tue, 20 Mar 2018 14:14:17 +0000 (+0100)
Subject: Handle -fno-guess-branch-probability properly in predict.c (PR ipa/84825).
X-Git-Tag: basepoints/gcc-9~579
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=14b05bee0ccd7a6a9d7c6d498121caa4d6f9e23d;p=thirdparty%2Fgcc.git

Handle -fno-guess-branch-probability properly in predict.c (PR ipa/84825).

2018-03-20  Martin Liska  <mliska@suse.cz>

	PR ipa/84825
	* predict.c (rebuild_frequencies): Handle case when we have
	PROFILE_ABSENT, but flag_guess_branch_prob is false.
2018-03-20  Martin Liska  <mliska@suse.cz>

	PR ipa/84825
	* g++.dg/ipa/pr84825.C: New test.

From-SVN: r258683
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3a7ebc9e19d5..f47c1922f69b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-20  Martin Liska  <mliska@suse.cz>
+
+	PR ipa/84825
+	* predict.c (rebuild_frequencies): Handle case when we have
+	PROFILE_ABSENT, but flag_guess_branch_prob is false.
+
 2018-03-20  Jakub Jelinek  <jakub@redhat.com>
 
 	PR target/84990
diff --git a/gcc/predict.c b/gcc/predict.c
index b40dec47822c..019ff9e44cf4 100644
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -3998,6 +3998,9 @@ rebuild_frequencies (void)
     }
   else if (profile_status_for_fn (cfun) == PROFILE_READ)
     update_max_bb_count ();
+  else if (profile_status_for_fn (cfun) == PROFILE_ABSENT
+	   && !flag_guess_branch_prob)
+    ;
   else
     gcc_unreachable ();
   timevar_pop (TV_REBUILD_FREQUENCIES);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a59f09a2007e..6c918c0065bf 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-20  Martin Liska  <mliska@suse.cz>
+
+	PR ipa/84825
+	* g++.dg/ipa/pr84825.C: New test.
+
 2018-03-20  Martin Liska  <mliska@suse.cz>
 
 	* gcc.dg/lto/chkp-ctor-merge_0.c: Remove.
diff --git a/gcc/testsuite/g++.dg/ipa/pr84825.C b/gcc/testsuite/g++.dg/ipa/pr84825.C
new file mode 100644
index 000000000000..7ae854e71406
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ipa/pr84825.C
@@ -0,0 +1,18 @@
+/* PR ipa/84658 */
+/* { dg-options "-O3 --param early-inlining-insns=0 -fno-guess-branch-probability" } */
+
+struct a;
+struct b;
+struct c {
+  virtual a *d(b *);
+};
+struct a {
+  virtual a e();
+};
+struct f {
+  virtual ~f();
+};
+struct g : f, a {};
+struct b : c, virtual g {
+  b *d(b *h) { return h; }
+} i;