From: Teresa Johnson <tejohnson@google.com>
Date: Wed, 15 Oct 2014 15:45:59 +0000 (+0000)
Subject: re PR bootstrap/63432 (profiledbootstrap failure with bootstrap-lto)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e631038f4b5ca08723d34c5523e47dc8c80ce602;p=gcc.git

re PR bootstrap/63432 (profiledbootstrap failure with bootstrap-lto)

2014-10-15  Teresa Johnson  <tejohnson@google.com>

	PR bootstrap/63432
	* tree-ssa-threadupdate.c (recompute_probabilities): Better
	overflow checking.

From-SVN: r216269
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 16817d4307d..9dc31881fb3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-15  Teresa Johnson  <tejohnson@google.com>
+
+	PR bootstrap/63432
+	* tree-ssa-threadupdate.c (recompute_probabilities): Better
+	overflow checking.
+
 2014-10-15  Renlin Li <renlin.li@arm.com>
 
 	* config/aarch64/aarch64.h (TARGET_CPU_CPP_BUILTINS): Define
diff --git a/gcc/tree-ssa-threadupdate.c b/gcc/tree-ssa-threadupdate.c
index 125f6f8776d..2be3ab2edf7 100644
--- a/gcc/tree-ssa-threadupdate.c
+++ b/gcc/tree-ssa-threadupdate.c
@@ -871,21 +871,23 @@ recompute_probabilities (basic_block bb)
   edge_iterator ei;
   FOR_EACH_EDGE (esucc, ei, bb->succs)
     {
-      if (bb->count)
+      if (!bb->count)
+        continue;
+
+      /* Prevent overflow computation due to insane profiles.  */
+      if (esucc->count < bb->count)
         esucc->probability = GCOV_COMPUTE_SCALE (esucc->count,
                                                  bb->count);
-      if (esucc->probability > REG_BR_PROB_BASE)
-        {
-	  /* Can happen with missing/guessed probabilities, since we
-	     may determine that more is flowing along duplicated
-	     path than joiner succ probabilities allowed.
-	     Counts and freqs will be insane after jump threading,
-	     at least make sure probability is sane or we will
-	     get a flow verification error.
-	     Not much we can do to make counts/freqs sane without
-	     redoing the profile estimation.  */
-	  esucc->probability = REG_BR_PROB_BASE;
-	}
+      else
+        /* Can happen with missing/guessed probabilities, since we
+           may determine that more is flowing along duplicated
+           path than joiner succ probabilities allowed.
+           Counts and freqs will be insane after jump threading,
+           at least make sure probability is sane or we will
+           get a flow verification error.
+           Not much we can do to make counts/freqs sane without
+           redoing the profile estimation.  */
+        esucc->probability = REG_BR_PROB_BASE;
     }
 }