re PR c++/85782 (acc loops with continue statements ICE in c++)

PR c++/85782

	gcc/cp/
	* cp-gimplify.c (cp_genericize_r): Call genericize_omp_for_stmt for
	OACC_LOOPs.

	gcc/testsuite/
	* c-c++-common/goacc/pr85782.c: New test.

	libgomp/
	* testsuite/libgomp.oacc-c-c++-common/pr85782.c: New test.

From-SVN: r260369

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 014662b16a52fe945d270f37183026fef6456c32..c526771f43f73c44b2cd92e88a24296fe748ac5c 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-18  Cesar Philippidis  <cesar@codesourcery.com>
+
+       PR c++/85782
+       * cp-gimplify.c (cp_genericize_r): Call genericize_omp_for_stmt for
+       OACC_LOOPs.
+
 2018-05-18  Richard Sandiford  <richard.sandiford@linaro.org>
 
        * constexpr.c (cxx_eval_constant_expression): Remove FMA_EXPR handling.

diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index eda5f05ea6a0be8fafcfd234ac9a12bb5d330aac..55aef86a2b8b1f174472c5cea42bb6e2b16a8ddb 100644 (file)
--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -1463,6 +1463,7 @@ cp_genericize_r (tree *stmt_p, int *walk_subtrees, void *data)
     case OMP_FOR:
     case OMP_SIMD:
     case OMP_DISTRIBUTE:
+    case OACC_LOOP:
       genericize_omp_for_stmt (stmt_p, walk_subtrees, data);
       break;
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 683c13eafb09e168eeaaa8a0d95b2001504a7423..08f53f7838d52e22aa547e1ef5e7129732ef057a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-18  Cesar Philippidis  <cesar@codesourcery.com>
+
+       PR c++/85782
+       * c-c++-common/goacc/pr85782.c: New test.
+
 2018-05-18  Sudakshina Das  <sudi.das@arm.com>
 
        * gcc.target/aarch64/sve/slp_5.c: Remove xfail for tld1d and tld2d.

diff --git a/gcc/testsuite/c-c++-common/goacc/pr85782.c b/gcc/testsuite/c-c++-common/goacc/pr85782.c
new file mode 100644 (file)
index 0000000..f213a24
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/goacc/pr85782.c
@@ -0,0 +1,11 @@
+/* PR c++/85782 */
+
+void
+foo ()
+{
+  int i;
+  
+  #pragma acc parallel loop
+  for (i = 0; i < 100; i++)
+    continue;
+}

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index ff9c7a7b26973ceb2ed0238fe3b3e12b8a1aa98d..a184a0660c70676bc1ca480c52e272dfc6ad5c2a 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-18  Cesar Philippidis  <cesar@codesourcery.com>
+
+       PR c++/85782
+       * testsuite/libgomp.oacc-c-c++-common/pr85782.c: New test.
+
 2018-05-09  Tom de Vries  <tom@codesourcery.com>
 
        PR libgomp/82901

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/pr85782.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/pr85782.c
new file mode 100644 (file)
index 0000000..6f84dfc
--- /dev/null
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/pr85782.c
@@ -0,0 +1,32 @@
+/* PR c++/85782 */
+
+#include <assert.h>
+
+#define N 100
+
+int
+main ()
+{
+  int i, a[N];
+
+  for (i = 0; i < N; i++)
+    a[i] = i+1;
+
+  #pragma acc parallel loop copy(a)
+  for (i = 0; i < N; i++)
+    {
+      if (i % 2)
+       continue;
+      a[i] = 0;
+    }
+
+  for (i = 0; i < N; i++)
+    {
+      if (i % 2)
+       assert (a[i] == i+1);
+      else
+       assert (a[i] == 0);
+    }
+
+    return 0;
+}