backport: re PR middle-end/48600 (ICE when using cold attribute)

	Backport from mainline
	PR middle-end/48600
	* predict.c (predict_paths_for_bb): Prevent looping.
	(predict_paths_leading_to_edge, predict_paths_leading_to): Update.

From-SVN: r185739

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ffe5d0351da65047a448c961804815e86434defb..b3eac01a4b751e641e6afb066cf9b762aec0c858 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-16  Jan Hubicka  <jh@suse.cz>
+
+       Backport from mainline
+       PR middle-end/48600
+       * predict.c (predict_paths_for_bb): Prevent looping.
+       (predict_paths_leading_to_edge, predict_paths_leading_to): Update.
+
 2012-03-16  Michael Hope  <michael.hope@linaro.org>
 
        Backport from mainline

diff --git a/gcc/predict.c b/gcc/predict.c
index dc1104f850e18a27a0e374b75cc1a7727912fdcc..b42afe32edda762070a2b74e4ed5657c2bad6768 100644 (file)
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -1790,7 +1790,8 @@ tree_estimate_probability_driver (void)
 static void
 predict_paths_for_bb (basic_block cur, basic_block bb,
                      enum br_predictor pred,
-                     enum prediction taken)
+                     enum prediction taken,
+                     bitmap visited)
 {
   edge e;
   edge_iterator ei;
@@ -1811,7 +1812,7 @@ predict_paths_for_bb (basic_block cur, basic_block bb,
        continue;
       gcc_assert (bb == cur || dominated_by_p (CDI_POST_DOMINATORS, cur, bb));
 
-      /* See if there is how many edge from e->src that is not abnormal
+      /* See if there is an edge from e->src that is not abnormal
         and does not lead to BB.  */
       FOR_EACH_EDGE (e2, ei2, e->src->succs)
        if (e2 != e
@@ -1824,16 +1825,20 @@ predict_paths_for_bb (basic_block cur, basic_block bb,
 
       /* If there is non-abnormal path leaving e->src, predict edge
         using predictor.  Otherwise we need to look for paths
-        leading to e->src.  */
+        leading to e->src.
+
+        The second may lead to infinite loop in the case we are predicitng
+        regions that are only reachable by abnormal edges.  We simply
+        prevent visiting given BB twice.  */
       if (found)
         predict_edge_def (e, pred, taken);
-      else
-       predict_paths_for_bb (e->src, e->src, pred, taken);
+      else if (!bitmap_set_bit (visited, e->src->index))
+       predict_paths_for_bb (e->src, e->src, pred, taken, visited);
     }
   for (son = first_dom_son (CDI_POST_DOMINATORS, cur);
        son;
        son = next_dom_son (CDI_POST_DOMINATORS, son))
-    predict_paths_for_bb (son, bb, pred, taken);
+    predict_paths_for_bb (son, bb, pred, taken, visited);
 }
 
 /* Sets branch probabilities according to PREDiction and
@@ -1843,7 +1848,9 @@ static void
 predict_paths_leading_to (basic_block bb, enum br_predictor pred,
                          enum prediction taken)
 {
-  predict_paths_for_bb (bb, bb, pred, taken);
+  bitmap visited = BITMAP_ALLOC (NULL);
+  predict_paths_for_bb (bb, bb, pred, taken, visited);
+  BITMAP_FREE (visited);
 }
 
 /* Like predict_paths_leading_to but take edge instead of basic block.  */
@@ -1866,7 +1873,11 @@ predict_paths_leading_to_edge (edge e, enum br_predictor pred,
        break;
       }
   if (!has_nonloop_edge)
-    predict_paths_for_bb (bb, bb, pred, taken);
+    {
+      bitmap visited = BITMAP_ALLOC (NULL);
+      predict_paths_for_bb (bb, bb, pred, taken, visited);
+      BITMAP_FREE (visited);
+    }
   else
     predict_edge_def (e, pred, taken);
 }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 70e599977f34eaeed16847a84779e6cd259ffde3..f4adf424099675bf5dca6593a514587abef635e0 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-16  Jan Hubicka  <jh@suse.cz>
+
+       PR middle-end/48600
+       * g++.dg/torture/pr48600.C: New testcase.
+
 2012-03-10  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/52469