From: Jan Hubicka <hubicka@ucw.cz>
Date: Thu, 20 Jul 2017 14:27:41 +0000 (+0200)
Subject: bb-reorder.c (connect_traces): Allow copying of blocks within single partition.
X-Git-Tag: basepoints/gcc-9~5881
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=584bafb66df106ddbc5ef6749462ca2375fa0086;p=thirdparty%2Fgcc.git

bb-reorder.c (connect_traces): Allow copying of blocks within single partition.

	* bb-reorder.c (connect_traces): Allow copying of blocks within
	single partition.

From-SVN: r250390
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ff8417971bcc..d489138e2c20 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-07-18  Jan Hubicka  <hubicka@ucw.cz>
+
+	* bb-reorder.c (connect_traces): Allow copying of blocks within
+	single partition.
+
 2017-07-20  Richard Biener  <rguenther@suse.de>
 
 	* gimple.h (gimple_phi_result): Add gphi * overload.
diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c
index 17a1ea3ed8d8..3b7278f2be12 100644
--- a/gcc/bb-reorder.c
+++ b/gcc/bb-reorder.c
@@ -1302,16 +1302,15 @@ connect_traces (int n_traces, struct trace *traces)
 		      }
 		  }
 
-	      if (crtl->has_bb_partition)
-		try_copy = false;
-
 	      /* Copy tiny blocks always; copy larger blocks only when the
 		 edge is traversed frequently enough.  */
 	      if (try_copy
+		  && BB_PARTITION (best->src) == BB_PARTITION (best->dest)
 		  && copy_bb_p (best->dest,
 				optimize_edge_for_speed_p (best)
 				&& EDGE_FREQUENCY (best) >= freq_threshold
-				&& best->count >= count_threshold))
+				&& (!best->count.initialized_p ()
+				    || best->count >= count_threshold)))
 		{
 		  basic_block new_bb;