From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 15 Sep 2017 21:34:10 +0000 (+0200)
Subject: backport: re PR middle-end/81052 (ICE in verify_dominators, at dominance.c:1184)
X-Git-Tag: releases/gcc-6.5.0~792
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b119515b708b2a8ef36806f43142e41f131f8e2a;p=thirdparty%2Fgcc.git

backport: re PR middle-end/81052 (ICE in verify_dominators, at dominance.c:1184)

	Backported from mainline
	2017-08-03  Jakub Jelinek  <jakub@redhat.com>

	PR middle-end/81052
	* omp-low.c (diagnose_sb_0): Handle flag_openmp_simd like flag_openmp.
	(pass_diagnose_omp_blocks::gate): Enable also for flag_openmp_simd.

	* c-c++-common/pr81052.c: New test.

From-SVN: r252856
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 53a5e170e109..546d94229427 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -8,6 +8,12 @@
 	behavior of always calling find_many_sub_basic_blocks on
 	the inserted prologue.
 
+	2017-08-03  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/81052
+	* omp-low.c (diagnose_sb_0): Handle flag_openmp_simd like flag_openmp.
+	(pass_diagnose_omp_blocks::gate): Enable also for flag_openmp_simd.
+
 	2017-08-02  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/79499
diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index 33faf23e039f..4e76ce0f35ec 100644
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -18027,7 +18027,7 @@ diagnose_sb_0 (gimple_stmt_iterator *gsi_p,
     }
   if (kind == NULL)
     {
-      gcc_checking_assert (flag_openmp);
+      gcc_checking_assert (flag_openmp || flag_openmp_simd);
       kind = "OpenMP";
     }
 
@@ -18446,7 +18446,7 @@ public:
   /* opt_pass methods: */
   virtual bool gate (function *)
   {
-    return flag_cilkplus || flag_openacc || flag_openmp;
+    return flag_cilkplus || flag_openacc || flag_openmp || flag_openmp_simd;
   }
   virtual unsigned int execute (function *)
     {
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 12d910fe41d4..2daad3f6259b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -6,6 +6,11 @@
 	PR middle-end/81766
 	* gcc.target/i386/pr81766.c: New testcase.
 
+	2017-08-03  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/81052
+	* c-c++-common/pr81052.c: New test.
+
 	2017-08-02  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/79499
diff --git a/gcc/testsuite/c-c++-common/pr81052.c b/gcc/testsuite/c-c++-common/pr81052.c
new file mode 100644
index 000000000000..6bc2879951e9
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/pr81052.c
@@ -0,0 +1,28 @@
+/* PR middle-end/81052 */
+/* { dg-do compile } */
+/* { dg-options "-fopenmp-simd -O2" } */
+
+int
+foo (int x, int y)
+{
+  int i;
+#pragma omp simd
+  for (i = x; i < y; ++i)
+    return 0;			/* { dg-error "invalid branch to/from OpenMP structured block" } */
+  return 1;
+}
+
+#ifdef __cplusplus
+template <typename T>
+T
+bar (T x, T y)
+{
+  T i;
+#pragma omp simd
+  for (i = x; i < y; ++i)
+    return 0;			/* { dg-error "invalid branch to/from OpenMP structured block" "" { target c++ } } */
+  return 1;
+}
+
+int x = bar (1, 7);
+#endif