From: Tobias Burnus <burnus@net-b.de>
Date: Mon, 12 May 2014 19:00:08 +0000 (+0200)
Subject: re PR fortran/60127 (ICE with OpenMP and DO CONCURRENT)
X-Git-Tag: releases/gcc-5.1.0~7640
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da7316cbac19eb2be839e01a5ebf27d97a8e7452;p=thirdparty%2Fgcc.git

re PR fortran/60127 (ICE with OpenMP and DO CONCURRENT)

2014-05-12  Tobias Burnus  <burnus@net-b.de>

        PR fortran/60127
        * openmp.c (resolve_omp_do): Reject do concurrent loops.

2014-05-12  Tobias Burnus  <burnus@net-b.de>

        PR fortran/60127
        * gfortran.dg/gomp/omp_do_concurrent.f90: New.

From-SVN: r210331
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 9f5ba6281430..606f6df20aff 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-12  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/60127
+	* openmp.c (resolve_omp_do): Reject do concurrent loops.
+
 2014-05-12  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
 	PR fortran/60834
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index 16c777417bb8..a578ad902886 100644
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -2169,6 +2169,12 @@ resolve_omp_do (gfc_code *code)
 		     "at %L", name, &do_code->loc);
 	  break;
 	}
+      if (do_code->op == EXEC_DO_CONCURRENT)
+	{
+	  gfc_error ("%s cannot be a DO CONCURRENT loop at %L", name,
+		     &do_code->loc);
+	  break;
+	}
       gcc_assert (do_code->op == EXEC_DO);
       if (do_code->ext.iterator->var->ts.type != BT_INTEGER)
 	gfc_error ("%s iteration variable must be of type integer at %L",
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 667ce8cfe5d0..a73f1f5d8fdf 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-12  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/60127
+	* gfortran.dg/gomp/omp_do_concurrent.f90: New.
+
 2014-05-12  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
 	PR fortran/60834
diff --git a/gcc/testsuite/gfortran.dg/gomp/omp_do_concurrent.f90 b/gcc/testsuite/gfortran.dg/gomp/omp_do_concurrent.f90
new file mode 100644
index 000000000000..83204791d953
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/gomp/omp_do_concurrent.f90
@@ -0,0 +1,13 @@
+! { dg-do compile }
+! { dg-options "-fopenmp" }
+!
+! PR fortran/60127
+!
+! OpenMP 4.0 doesn't permit DO CONCURRENT (yet)
+!
+
+!$omp do
+do concurrent(i=1:5) ! { dg-error "OMP DO cannot be a DO CONCURRENT loop" }
+print *, 'Hello'
+end do
+end