From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 19 Oct 2018 08:40:35 +0000 (+0200)
Subject: parser.c (cp_parser_omp_for_loop): Disallow ordered clause with argument for range... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c980e1864f63ed624be992ec7d550f610d270cba;p=thirdparty%2Fgcc.git

parser.c (cp_parser_omp_for_loop): Disallow ordered clause with argument for range-for loops.

	* parser.c (cp_parser_omp_for_loop): Disallow ordered clause with
	argument for range-for loops.

	* g++.dg/gomp/doacross-1.C: New test.

From-SVN: r265307
---

diff --git a/gcc/cp/ChangeLog.gomp b/gcc/cp/ChangeLog.gomp
index 63e41c8f7175..94472fcf6a9d 100644
--- a/gcc/cp/ChangeLog.gomp
+++ b/gcc/cp/ChangeLog.gomp
@@ -1,3 +1,8 @@
+2018-10-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* parser.c (cp_parser_omp_for_loop): Disallow ordered clause with
+	argument for range-for loops.
+
 2018-10-18  Jakub Jelinek  <jakub@redhat.com>
 
 	* parser.c (cp_parser_omp_taskloop): Add forward declaration.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index ae92961634b2..e3c36b3dca67 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -36139,6 +36139,11 @@ cp_parser_omp_for_loop (cp_parser *parser, enum tree_code code, tree clauses,
 		    pre_body = this_pre_body;
 		}
 
+	      if (ordered_cl)
+		error_at (OMP_CLAUSE_LOCATION (ordered_cl),
+			  "%<ordered%> clause with parameter on "
+			  "range-based %<for%> loop");
+
 	      goto parse_close_paren;
 	    }
 	}
diff --git a/gcc/testsuite/ChangeLog.gomp b/gcc/testsuite/ChangeLog.gomp
index 5a471f84ec6d..d67caa1efdec 100644
--- a/gcc/testsuite/ChangeLog.gomp
+++ b/gcc/testsuite/ChangeLog.gomp
@@ -1,3 +1,7 @@
+2018-10-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* g++.dg/gomp/doacross-1.C: New test.
+
 2018-10-18  Jakub Jelinek  <jakub@redhat.com>
 
 	* c-c++-common/gomp/clauses-1.c (foo): Add ntm argument and
diff --git a/gcc/testsuite/g++.dg/gomp/doacross-1.C b/gcc/testsuite/g++.dg/gomp/doacross-1.C
new file mode 100644
index 000000000000..9381b3aa85de
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gomp/doacross-1.C
@@ -0,0 +1,21 @@
+// { dg-do compile { target c++11 } }
+// { dg-options "-fopenmp" }
+
+int a[42];
+
+void
+foo ()
+{
+  #pragma omp for ordered (1)	// { dg-error "'ordered' clause with parameter on range-based 'for' loop" }
+  for (auto x : a)
+    ;
+}
+
+void
+bar ()
+{
+  #pragma omp for ordered (2)	// { dg-error "'ordered' clause with parameter on range-based 'for' loop" }
+  for (int i = 0; i < 1; i++)
+    for (auto x : a)
+      ;
+}