shrink-wrap: Fix up partitions (PR67587)

With the new shrink-wrap algorithm, blocks reachable both with and
without prologue are duplicated, and their incoming edges are then
distributed accordingly.  So we need to call fixup_partitions.

2015-09-16  Segher Boessenkool  <segher@kernel.crashing.org>

	PR bootstrap/67587
	* function.c (rest_of_handle_thread_prologue_and_epilogue): Call
	fixup_partitions.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@227827 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e09c84c38d2cd6ee2d2f10dedbcd5220390cfca8..cdbfe48f7c63ce4538f8c674d9fd02b244d6f372 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-09-16  Segher Boessenkool  <segher@kernel.crashing.org>
+
+       PR bootstrap/67587
+       * function.c (rest_of_handle_thread_prologue_and_epilogue): Call
+       fixup_partitions.
+
 2015-09-16  Richard Biener  <rguenther@suse.de>
 
        PR middle-end/67253

diff --git a/gcc/function.c b/gcc/function.c
index 2c5a6d484f6816b513f46e5d6a6b51cb00671e49..bb75b1c80852093e0dfd5089a3e3a05a88331021 100644 (file)
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -6668,6 +6668,10 @@ rest_of_handle_thread_prologue_and_epilogue (void)
      scheduling to operate in the epilogue.  */
   thread_prologue_and_epilogue_insns ();
 
+  /* Some non-cold blocks may now be only reachable from cold blocks.
+     Fix that up.  */
+  fixup_partitions ();
+
   /* Shrink-wrapping can result in unreachable edges in the epilogue,
      see PR57320.  */
   cleanup_cfg (0);