From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 21 Mar 2018 20:53:16 +0000 (+0100)
Subject: re PR tree-optimization/84960 (ICE in GIMPLE pass: isolate-paths)
X-Git-Tag: basepoints/gcc-9~538
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e129b5bc6bc96a0844dcdf75188dc4710028939;p=thirdparty%2Fgcc.git

re PR tree-optimization/84960 (ICE in GIMPLE pass: isolate-paths)

	PR tree-optimization/84960
	* tree-cfg.c (remove_bb): Don't move forced labels into bb->prev_bb
	if it is ENTRY block, move them into single succ of ENTRY in that case.

	* gcc.c-torture/compile/pr84960.c: New test.

From-SVN: r258744
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2c5ed01e3f44..eeab1f1a3aa7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-21  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/84960
+	* tree-cfg.c (remove_bb): Don't move forced labels into bb->prev_bb
+	if it is ENTRY block, move them into single succ of ENTRY in that case.
+
 2018-03-21  Richard Sandiford  <richard.sandiford@linaro.org>
 
 	PR tree-optimization/84811
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 36e16266c005..faf418dd1b1f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-21  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/84960
+	* gcc.c-torture/compile/pr84960.c: New test.
+
 2018-03-21  Richard Sandiford  <richard.sandiford@linaro.org>
 
 	PR tree-optimization/84811
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr84960.c b/gcc/testsuite/gcc.c-torture/compile/pr84960.c
new file mode 100644
index 000000000000..b076f793b093
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr84960.c
@@ -0,0 +1,17 @@
+/* PR tree-optimization/84960 */
+/* { dg-do compile { target indirect_jumps } } */
+
+void
+foo (unsigned int a, float b, void *c)
+{
+lab:
+  if ((b - (a %= 0) < 1U) * -1U)
+    ;
+  else
+    {
+      unsigned int f = a;
+      __builtin_unreachable ();
+      c = &&lab;
+    }
+  goto *c;
+}
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index b87e48dade63..9485f73f341e 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -2301,6 +2301,12 @@ remove_bb (basic_block bb)
 		}
 
 	      new_bb = bb->prev_bb;
+	      /* Don't move any labels into ENTRY block.  */
+	      if (new_bb == ENTRY_BLOCK_PTR_FOR_FN (cfun))
+		{
+		  new_bb = single_succ (new_bb);
+		  gcc_assert (new_bb != bb);
+		}
 	      new_gsi = gsi_start_bb (new_bb);
 	      gsi_remove (&i, false);
 	      gsi_insert_before (&new_gsi, stmt, GSI_NEW_STMT);