re PR tree-optimization/90208 (error: EH landing pad label)

	PR tree-optimization/90208
	* tree-cfg.c (remove_bb): Move forced labels from removed bbs
	after labels of new_bb, not before them.

	* gcc.dg/tsan/pr90208-1.c: New test.
	* gcc.dg/tsan/pr90208-2.c: New test.

From-SVN: r270534

gcc/ChangeLog

 2019-04-24  Jakub Jelinek  <jakub@redhat.com>
 
+	PR tree-optimization/90208
+	* tree-cfg.c (remove_bb): Move forced labels from removed bbs
+	after labels of new_bb, not before them.
+
 	PR tree-optimization/90211
 	* tree-parloops.c (try_create_reduction_list): Ignore phi arguments
 	which are not SSA_NAMEs.

gcc/testsuite/ChangeLog

 2019-04-24  Jakub Jelinek  <jakub@redhat.com>
 
+	PR tree-optimization/90208
+	* gcc.dg/tsan/pr90208-1.c: New test.
+	* gcc.dg/tsan/pr90208-2.c: New test.
+
 	PR tree-optimization/90211
 	* gcc.dg/autopar/pr90211.c: New test.
 

gcc/testsuite/gcc.dg/tsan/pr90208-1.c

+/* PR tree-optimization/90208 */
+/* { dg-do compile } */
+/* { dg-options "-O3 -fexceptions -fsanitize=thread" } */
+
+#include "../../gcc.c-torture/compile/pr89280.c"

gcc/testsuite/gcc.dg/tsan/pr90208-2.c

+/* PR tree-optimization/90208 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -fexceptions -fsanitize=thread" } */
+
+void *b[5];
+void foo (void);
+
+void
+bar (int d)
+{
+  while (d)
+    foo ();
+}
+
+void
+baz (void)
+{
+  bar (2);
+  __builtin_setjmp (b);
+}

gcc/tree-cfg.c

@@ -2265,7 +2265,7 @@ remove_bb (basic_block bb)
 		  new_bb = single_succ (new_bb);
 		  gcc_assert (new_bb != bb);
 		}
-	      new_gsi = gsi_start_bb (new_bb);
+	      new_gsi = gsi_after_labels (new_bb);
 	      gsi_remove (&i, false);
 	      gsi_insert_before (&new_gsi, stmt, GSI_NEW_STMT);
 	    }