Revert "[OPENMP] Allow skip expression after comma in clauses with lists."

This reverts commit http://reviews.llvm.org/rL265003. After some
thoughts decided to emit errors here.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@265119 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Parse/ParseOpenMP.cpp b/lib/Parse/ParseOpenMP.cpp
index 68e725c0c7d645ad08f30d2bb93b29445351fc66..96cf37912f2ab3b84cfc76b1a8b108a58cd73fa4 100644 (file)
--- a/lib/Parse/ParseOpenMP.cpp
+++ b/lib/Parse/ParseOpenMP.cpp
@@ -1414,18 +1414,17 @@ OMPClause *Parser::ParseOpenMPVarListClause(OpenMPDirectiveKind DKind,
     // Parse variable
     ExprResult VarExpr =
         Actions.CorrectDelayedTyposInExpr(ParseAssignmentExpression());
-    if (VarExpr.isUsable())
+    if (VarExpr.isUsable()) {
       Vars.push_back(VarExpr.get());
-    else {
+    } else {
       SkipUntil(tok::comma, tok::r_paren, tok::annot_pragma_openmp_end,
                 StopBeforeMatch);
     }
     // Skip ',' if any
     IsComma = Tok.is(tok::comma);
-    if (IsComma) {
+    if (IsComma)
       ConsumeToken();
-      IsComma = false;
-    } else if (Tok.isNot(tok::r_paren) &&
+    else if (Tok.isNot(tok::r_paren) &&
              Tok.isNot(tok::annot_pragma_openmp_end) &&
              (!MayHaveTail || Tok.isNot(tok::colon)))
       Diag(Tok, diag::err_omp_expected_punc)

diff --git a/test/OpenMP/distribute_firstprivate_messages.cpp b/test/OpenMP/distribute_firstprivate_messages.cpp
index 6e614b427dae2e0665e6313295be54ff46776861..5d371abbfa8e5d9042081609e944cbf82815b54e 100644 (file)
--- a/test/OpenMP/distribute_firstprivate_messages.cpp
+++ b/test/OpenMP/distribute_firstprivate_messages.cpp
@@ -75,7 +75,7 @@ int main(int argc, char **argv) {
   for (i = 0; i < argc; ++i) foo();
   #pragma omp target
   #pragma omp teams
-  #pragma omp distribute firstprivate (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp distribute firstprivate (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i) foo();
   #pragma omp target
   #pragma omp teams

diff --git a/test/OpenMP/distribute_private_messages.cpp b/test/OpenMP/distribute_private_messages.cpp
index c04c30a565c41d6f8367d75727e264dd80ede407..518b64d9e9ca0fc09546f0d433e17d0035dfb821 100644 (file)
--- a/test/OpenMP/distribute_private_messages.cpp
+++ b/test/OpenMP/distribute_private_messages.cpp
@@ -57,7 +57,7 @@ int main(int argc, char **argv) {
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp distribute private (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp distribute private (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp distribute private (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp distribute private (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   for (int k = 0; k < argc; ++k) ++k;

diff --git a/test/OpenMP/flush_messages.cpp b/test/OpenMP/flush_messages.cpp
index 0960ce3c9be2f7e4c4412471b92c2cc364ba8a67..1c086a3f3fa4abc55eff45652d0dfe3fb593838e 100644 (file)
--- a/test/OpenMP/flush_messages.cpp
+++ b/test/OpenMP/flush_messages.cpp
@@ -60,7 +60,7 @@ label1 : {
 #pragma omp flush(                              // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
 #pragma omp flush()                             // expected-error {{expected expression}}
 #pragma omp flush(argc                          // expected-error {{expected ')'}} expected-note {{to match this '('}}
-#pragma omp flush(argc,                         // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp flush(argc,                         // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
 #pragma omp flush(argc)
 #pragma omp flush(S1) // expected-error {{'S1' does not refer to a value}}
 #pragma omp flush(argc) flush(argc) // expected-warning {{extra tokens at the end of '#pragma omp flush' are ignored}}
@@ -124,7 +124,7 @@ label1 : {
 #pragma omp flush(                              // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
 #pragma omp flush()                             // expected-error {{expected expression}}
 #pragma omp flush(argc                          // expected-error {{expected ')'}} expected-note {{to match this '('}}
-#pragma omp flush(argc,                         // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp flush(argc,                         // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
 #pragma omp flush(argc)
 #pragma omp flush(S1) // expected-error {{'S1' does not refer to a value}}
 #pragma omp flush(argc) flush(argc) // expected-warning {{extra tokens at the end of '#pragma omp flush' are ignored}}

diff --git a/test/OpenMP/for_ast_print.cpp b/test/OpenMP/for_ast_print.cpp
index 552405a95e99b4f2e8c5d730bd2da51c80576e0e..182b395c13ca14201864af8b5015cc1f2b9ad22f 100644 (file)
--- a/test/OpenMP/for_ast_print.cpp
+++ b/test/OpenMP/for_ast_print.cpp
@@ -147,7 +147,7 @@ int main(int argc, char **argv) {
 // CHECK-NEXT: for (int i = 0; i < 2; ++i)
 // CHECK-NEXT: a = 2;
 #pragma omp parallel
-#pragma omp for private(argc, b), firstprivate(argv, c,), lastprivate(d, f,) collapse(2) schedule(auto) ordered nowait linear(g,:-1)
+#pragma omp for private(argc, b), firstprivate(argv, c), lastprivate(d, f) collapse(2) schedule(auto) ordered nowait linear(g:-1)
   for (int i = 0; i < 10; ++i)
     for (int j = 0; j < 10; ++j)
       foo();

diff --git a/test/OpenMP/for_firstprivate_messages.cpp b/test/OpenMP/for_firstprivate_messages.cpp
index 50a37a52ceed47cb16569f4be484f3e182c813be..60be4f5f2a2b1b1995a157b4ee8f0d71bdcd1e4c 100644 (file)
--- a/test/OpenMP/for_firstprivate_messages.cpp
+++ b/test/OpenMP/for_firstprivate_messages.cpp
@@ -83,7 +83,7 @@ int foomain(int argc, char **argv) {
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel
-#pragma omp for firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp for firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel
@@ -189,7 +189,7 @@ int main(int argc, char **argv) {
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel
-#pragma omp for firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp for firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel

diff --git a/test/OpenMP/for_lastprivate_messages.cpp b/test/OpenMP/for_lastprivate_messages.cpp
index ba23dc494440c85e0e611b7fbee49011f612e7b8..79912b6efbca6c29bbe6eb91a947004c8687adab 100644 (file)
--- a/test/OpenMP/for_lastprivate_messages.cpp
+++ b/test/OpenMP/for_lastprivate_messages.cpp
@@ -85,7 +85,7 @@ int foomain(int argc, char **argv) {
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel
-#pragma omp for lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp for lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel
@@ -179,7 +179,7 @@ int main(int argc, char **argv) {
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel
-#pragma omp for lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp for lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel

diff --git a/test/OpenMP/for_linear_messages.cpp b/test/OpenMP/for_linear_messages.cpp
index be79d1125aba190741c4672175c296fc53550d37..ab8934979ac30c661cc8cf116e15f8bbcd47c6d3 100644 (file)
--- a/test/OpenMP/for_linear_messages.cpp
+++ b/test/OpenMP/for_linear_messages.cpp
@@ -111,7 +111,7 @@ template<class I, class C> int foomain(I argc, C **argv) {
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp for linear (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp for linear (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp for linear (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp for linear (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   for (int k = 0; k < argc; ++k) ++k;
@@ -177,7 +177,7 @@ int main(int argc, char **argv) {
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp for linear (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp for linear (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp for linear (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp for linear (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   for (int k = 0; k < argc; ++k) ++k;

diff --git a/test/OpenMP/for_misc_messages.c b/test/OpenMP/for_misc_messages.c
index 77d57e6104b1324c10e11b070c864a9e6da356a6..0a7cdf8fc06b89c1ff7f3b68f7727278169489f0 100644 (file)
--- a/test/OpenMP/for_misc_messages.c
+++ b/test/OpenMP/for_misc_messages.c
@@ -211,12 +211,12 @@ void test_private() {
     ;
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp for private(,
   for (i = 0; i < 16; ++i)
     ;
 #pragma omp parallel
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp for private(, )
   for (i = 0; i < 16; ++i)
     ;
@@ -263,12 +263,12 @@ void test_lastprivate() {
 
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp for lastprivate(,
   for (i = 0; i < 16; ++i)
     ;
 #pragma omp parallel
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp for lastprivate(, )
   for (i = 0; i < 16; ++i)
     ;
@@ -314,12 +314,12 @@ void test_firstprivate() {
 
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp for firstprivate(,
   for (i = 0; i < 16; ++i)
     ;
 #pragma omp parallel
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp for firstprivate(, )
   for (i = 0; i < 16; ++i)
     ;

diff --git a/test/OpenMP/for_private_messages.cpp b/test/OpenMP/for_private_messages.cpp
index 604eab07422aa879804beeaa3920098a3d2eea39..4045c5b56ff5cec3b34f54f155ce6f3a894899bb 100644 (file)
--- a/test/OpenMP/for_private_messages.cpp
+++ b/test/OpenMP/for_private_messages.cpp
@@ -108,7 +108,7 @@ int foomain(I argc, C **argv) {
 #pragma omp for private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp for private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp for private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp for private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
@@ -190,7 +190,7 @@ int main(int argc, char **argv) {
 #pragma omp for private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp for private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp for private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp for private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}

diff --git a/test/OpenMP/for_reduction_messages.cpp b/test/OpenMP/for_reduction_messages.cpp
index d8c78a0e0b743b5b4ec747f81aad6ff3bafe12e9..45a4681440fc2d2f2d7b775ed241046b2460ead7 100644 (file)
--- a/test/OpenMP/for_reduction_messages.cpp
+++ b/test/OpenMP/for_reduction_messages.cpp
@@ -115,7 +115,7 @@ T tmain(T argc) {
   for (int i = 0; i < 10; ++i)
     foo();
 #pragma omp parallel
-#pragma omp for reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
+#pragma omp for reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
   for (int i = 0; i < 10; ++i)
     foo();
 #pragma omp parallel
@@ -272,7 +272,7 @@ int main(int argc, char **argv) {
   for (int i = 0; i < 10; ++i)
     foo();
 #pragma omp parallel
-#pragma omp for reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp for reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int i = 0; i < 10; ++i)
     foo();
 #pragma omp parallel

diff --git a/test/OpenMP/for_simd_aligned_messages.cpp b/test/OpenMP/for_simd_aligned_messages.cpp
index b730da65e7890d207db98a0ecf6bfbb3d3820899..cef83c30e239cd307a16a7399c012b487f301b61 100644 (file)
--- a/test/OpenMP/for_simd_aligned_messages.cpp
+++ b/test/OpenMP/for_simd_aligned_messages.cpp
@@ -119,7 +119,7 @@ template<class I, class C> int foomain(I argc, C **argv) {
   for (I k = 0; k < argc; ++k) ++k;
   #pragma omp for simd aligned (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (I k = 0; k < argc; ++k) ++k;
-  #pragma omp for simd aligned (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp for simd aligned (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (I k = 0; k < argc; ++k) ++k;
   #pragma omp for simd aligned (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   for (I k = 0; k < argc; ++k) ++k;
@@ -177,7 +177,7 @@ int main(int argc, char **argv) {
   #pragma omp for simd aligned (argv // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
   // expected-error@+1 {{argument of aligned clause should be array, pointer, reference to array or reference to pointer, not 'int'}}
-  #pragma omp for simd aligned (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp for simd aligned (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp for simd aligned (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   for (int k = 0; k < argc; ++k) ++k;

diff --git a/test/OpenMP/for_simd_firstprivate_messages.cpp b/test/OpenMP/for_simd_firstprivate_messages.cpp
index b8afb8e4d6a858869b10260cbfed3b95e03078f4..4e96866c1a2c2193d05753895757ada70ec62b79 100644 (file)
--- a/test/OpenMP/for_simd_firstprivate_messages.cpp
+++ b/test/OpenMP/for_simd_firstprivate_messages.cpp
@@ -83,7 +83,7 @@ int foomain(int argc, char **argv) {
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel
-#pragma omp for simd firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp for simd firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel
@@ -186,7 +186,7 @@ int main(int argc, char **argv) {
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel
-#pragma omp for simd firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp for simd firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel

diff --git a/test/OpenMP/for_simd_lastprivate_messages.cpp b/test/OpenMP/for_simd_lastprivate_messages.cpp
index c54799afcce91a093f74e372bb7091d0418f1bc2..d48c07d92b39ee8e67fe55cc552ed72809ddf889 100644 (file)
--- a/test/OpenMP/for_simd_lastprivate_messages.cpp
+++ b/test/OpenMP/for_simd_lastprivate_messages.cpp
@@ -85,7 +85,7 @@ int foomain(int argc, char **argv) {
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel
-#pragma omp for simd lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp for simd lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel
@@ -176,7 +176,7 @@ int main(int argc, char **argv) {
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel
-#pragma omp for simd lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp for simd lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel

diff --git a/test/OpenMP/for_simd_linear_messages.cpp b/test/OpenMP/for_simd_linear_messages.cpp
index 3ce4a07f471e48b37dd9e4e85c532e567d47f0c4..3f93125a38a29871a596f3f0e0141acea7d00a48 100644 (file)
--- a/test/OpenMP/for_simd_linear_messages.cpp
+++ b/test/OpenMP/for_simd_linear_messages.cpp
@@ -111,7 +111,7 @@ template<class I, class C> int foomain(I argc, C **argv) {
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp for simd linear (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp for simd linear (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp for simd linear (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp for simd linear (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   for (int k = 0; k < argc; ++k) ++k;
@@ -175,7 +175,7 @@ int main(int argc, char **argv) {
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp for simd linear (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp for simd linear (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp for simd linear (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp for simd linear (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   for (int k = 0; k < argc; ++k) ++k;

diff --git a/test/OpenMP/for_simd_misc_messages.c b/test/OpenMP/for_simd_misc_messages.c
index ec5ee67f26edbd2c0188d2929f83da6047cc1896..ca1e366ca092edaec5ad8fe0448a6e5c0404a9e2 100644 (file)
--- a/test/OpenMP/for_simd_misc_messages.c
+++ b/test/OpenMP/for_simd_misc_messages.c
@@ -388,10 +388,12 @@ void test_linear() {
 #pragma omp for simd linear(
   for (i = 0; i < 16; ++i)
     ;
+// expected-error@+2 {{expected expression}}
 // expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
 #pragma omp for simd linear(,
   for (i = 0; i < 16; ++i)
     ;
+// expected-error@+2 {{expected expression}}
 // expected-error@+1 {{expected expression}}
 #pragma omp for simd linear(, )
   for (i = 0; i < 16; ++i)
@@ -491,10 +493,12 @@ void test_aligned() {
 #pragma omp for simd aligned(
   for (i = 0; i < 16; ++i)
     ;
+// expected-error@+2 {{expected expression}}
 // expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
 #pragma omp for simd aligned(,
   for (i = 0; i < 16; ++i)
     ;
+// expected-error@+2 {{expected expression}}
 // expected-error@+1 {{expected expression}}
 #pragma omp for simd aligned(, )
   for (i = 0; i < 16; ++i)
@@ -591,12 +595,12 @@ void test_private() {
     ;
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp for simd private(,
   for (i = 0; i < 16; ++i)
     ;
 #pragma omp parallel
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp for simd private(, )
   for (i = 0; i < 16; ++i)
     ;
@@ -643,12 +647,12 @@ void test_lastprivate() {
 
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp for simd lastprivate(,
   for (i = 0; i < 16; ++i)
     ;
 #pragma omp parallel
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp for simd lastprivate(, )
   for (i = 0; i < 16; ++i)
     ;
@@ -694,12 +698,12 @@ void test_firstprivate() {
 
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp for simd firstprivate(,
   for (i = 0; i < 16; ++i)
     ;
 #pragma omp parallel
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp for simd firstprivate(, )
   for (i = 0; i < 16; ++i)
     ;

diff --git a/test/OpenMP/for_simd_private_messages.cpp b/test/OpenMP/for_simd_private_messages.cpp
index a2fffba27bfd50a292e563f5dadfd20025230ea9..ca4c3a33fcafff9bc166f11a6efef88612eeae04 100644 (file)
--- a/test/OpenMP/for_simd_private_messages.cpp
+++ b/test/OpenMP/for_simd_private_messages.cpp
@@ -108,7 +108,7 @@ int foomain(I argc, C **argv) {
 #pragma omp for simd private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp for simd private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp for simd private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp for simd private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
@@ -183,7 +183,7 @@ int main(int argc, char **argv) {
 #pragma omp for simd private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp for simd private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp for simd private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp for simd private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}

diff --git a/test/OpenMP/for_simd_reduction_messages.cpp b/test/OpenMP/for_simd_reduction_messages.cpp
index 479fe5c4832de79e45076d720a6f38788ece8738..2935cec602dd23a81ffe86dc449d1f354dc98cc5 100644 (file)
--- a/test/OpenMP/for_simd_reduction_messages.cpp
+++ b/test/OpenMP/for_simd_reduction_messages.cpp
@@ -114,7 +114,7 @@ T tmain(T argc) {
   for (int i = 0; i < 10; ++i)
     foo();
 #pragma omp parallel
-#pragma omp for simd reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
+#pragma omp for simd reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
   for (int i = 0; i < 10; ++i)
     foo();
 #pragma omp parallel
@@ -263,7 +263,7 @@ int main(int argc, char **argv) {
   for (int i = 0; i < 10; ++i)
     foo();
 #pragma omp parallel
-#pragma omp for simd reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp for simd reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int i = 0; i < 10; ++i)
     foo();
 #pragma omp parallel

diff --git a/test/OpenMP/parallel_copyin_messages.cpp b/test/OpenMP/parallel_copyin_messages.cpp
index 6be264c0f4c563c6f26583153b6e7a1102d40000..2b54b43b87c66087beddf8d6880918183f579b20 100644 (file)
--- a/test/OpenMP/parallel_copyin_messages.cpp
+++ b/test/OpenMP/parallel_copyin_messages.cpp
@@ -60,7 +60,7 @@ int main(int argc, char **argv) {
   #pragma omp parallel copyin ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   #pragma omp parallel copyin () // expected-error {{expected expression}}
   #pragma omp parallel copyin (k // expected-error {{expected ')'}} expected-note {{to match this '('}}
-  #pragma omp parallel copyin (h, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp parallel copyin (h, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   #pragma omp parallel copyin (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   #pragma omp parallel copyin (l) // expected-error {{'operator=' is a private member of 'S4'}}
   #pragma omp parallel copyin (S1) // expected-error {{'S1' does not refer to a value}}

diff --git a/test/OpenMP/parallel_firstprivate_messages.cpp b/test/OpenMP/parallel_firstprivate_messages.cpp
index 1e065480f420101e5fd2bb5f36c2261cf03abeac..fc0eb4c7d3586b836ce18dc80facf9b520c15f25 100644 (file)
--- a/test/OpenMP/parallel_firstprivate_messages.cpp
+++ b/test/OpenMP/parallel_firstprivate_messages.cpp
@@ -67,7 +67,7 @@ int main(int argc, char **argv) {
   #pragma omp parallel firstprivate ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   #pragma omp parallel firstprivate () // expected-error {{expected expression}}
   #pragma omp parallel firstprivate (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
-  #pragma omp parallel firstprivate (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp parallel firstprivate (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   #pragma omp parallel firstprivate (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   #pragma omp parallel firstprivate (argc)
   #pragma omp parallel firstprivate (S1) // expected-error {{'S1' does not refer to a value}}

diff --git a/test/OpenMP/parallel_for_copyin_messages.cpp b/test/OpenMP/parallel_for_copyin_messages.cpp
index 229b0faef074207e68974570f0514a2efc67f75c..5a5d1632c8eb286405ba7204b31d9497bf3c390f 100644 (file)
--- a/test/OpenMP/parallel_for_copyin_messages.cpp
+++ b/test/OpenMP/parallel_for_copyin_messages.cpp
@@ -72,7 +72,7 @@ int main(int argc, char **argv) {
 #pragma omp parallel for copyin(k // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
-#pragma omp parallel for copyin(h, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel for copyin(h, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel for copyin(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}

diff --git a/test/OpenMP/parallel_for_firstprivate_messages.cpp b/test/OpenMP/parallel_for_firstprivate_messages.cpp
index b5b6d31b5207b900a41463e33cb416a6316ea7d7..c9a69dab2cb25d80c56be9bf140e3ed9533efd87 100644 (file)
--- a/test/OpenMP/parallel_for_firstprivate_messages.cpp
+++ b/test/OpenMP/parallel_for_firstprivate_messages.cpp
@@ -78,7 +78,7 @@ int foomain(int argc, char **argv) {
 #pragma omp parallel for firstprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp parallel for firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel for firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel for firstprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
@@ -163,7 +163,7 @@ int main(int argc, char **argv) {
 #pragma omp parallel for firstprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
-#pragma omp parallel for firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel for firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel for firstprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}

diff --git a/test/OpenMP/parallel_for_lastprivate_messages.cpp b/test/OpenMP/parallel_for_lastprivate_messages.cpp
index 9a98c37ae3b9800688e7b8861474ff574edf3694..ccfe2ea407b189eae43fbee9f9ca4568a30a06f1 100644 (file)
--- a/test/OpenMP/parallel_for_lastprivate_messages.cpp
+++ b/test/OpenMP/parallel_for_lastprivate_messages.cpp
@@ -80,7 +80,7 @@ int foomain(int argc, char **argv) {
 #pragma omp parallel for lastprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp parallel for lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel for lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel for lastprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
@@ -154,7 +154,7 @@ int main(int argc, char **argv) {
 #pragma omp parallel for lastprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
-#pragma omp parallel for lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel for lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel for lastprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}

diff --git a/test/OpenMP/parallel_for_linear_messages.cpp b/test/OpenMP/parallel_for_linear_messages.cpp
index e2e91bb6a606885517b17fb1544436d26b744afd..e5f5b61873c89a77154faedfb833c38e3b554c76 100644 (file)
--- a/test/OpenMP/parallel_for_linear_messages.cpp
+++ b/test/OpenMP/parallel_for_linear_messages.cpp
@@ -131,7 +131,7 @@ int foomain(I argc, C **argv) {
 #pragma omp parallel for linear(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp parallel for linear(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel for linear(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel for linear(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
@@ -216,7 +216,7 @@ int main(int argc, char **argv) {
 #pragma omp parallel for linear(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp parallel for linear(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel for linear(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel for linear(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}

diff --git a/test/OpenMP/parallel_for_misc_messages.c b/test/OpenMP/parallel_for_misc_messages.c
index 3f6e2e397832597de70e3fe9171e3dc60d50be98..1a773be617c7de6d9d41059ea93a41fdda93df56 100644 (file)
--- a/test/OpenMP/parallel_for_misc_messages.c
+++ b/test/OpenMP/parallel_for_misc_messages.c
@@ -180,11 +180,11 @@ void test_private() {
   for (i = 0; i < 16; ++i)
     ;
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp parallel for private(,
   for (i = 0; i < 16; ++i)
     ;
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp parallel for private(, )
   for (i = 0; i < 16; ++i)
     ;
@@ -223,11 +223,11 @@ void test_lastprivate() {
     ;
 
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp parallel for lastprivate(,
   for (i = 0; i < 16; ++i)
     ;
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp parallel for lastprivate(, )
   for (i = 0; i < 16; ++i)
     ;
@@ -265,11 +265,11 @@ void test_firstprivate() {
     ;
 
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp parallel for firstprivate(,
   for (i = 0; i < 16; ++i)
     ;
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp parallel for firstprivate(, )
   for (i = 0; i < 16; ++i)
     ;

diff --git a/test/OpenMP/parallel_for_private_messages.cpp b/test/OpenMP/parallel_for_private_messages.cpp
index 0dc0a20470f2ab655384924f03ec362ff27453ee..cc1b79f4111b0dc5547e722c541f06f263790331 100644 (file)
--- a/test/OpenMP/parallel_for_private_messages.cpp
+++ b/test/OpenMP/parallel_for_private_messages.cpp
@@ -108,7 +108,7 @@ int foomain(I argc, C **argv) {
 #pragma omp parallel for private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp parallel for private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel for private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel for private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
@@ -183,7 +183,7 @@ int main(int argc, char **argv) {
 #pragma omp parallel for private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp parallel for private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel for private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel for private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}

diff --git a/test/OpenMP/parallel_for_reduction_messages.cpp b/test/OpenMP/parallel_for_reduction_messages.cpp
index 5ad8cda5714183de77f4bde09bff789d1d49249e..4d5a143bae3a3735a9005a86e80ab9aed63637a5 100644 (file)
--- a/test/OpenMP/parallel_for_reduction_messages.cpp
+++ b/test/OpenMP/parallel_for_reduction_messages.cpp
@@ -105,7 +105,7 @@ T tmain(T argc) {
 #pragma omp parallel for reduction(& : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
   for (int i = 0; i < 10; ++i)
     foo();
-#pragma omp parallel for reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
+#pragma omp parallel for reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
   for (int i = 0; i < 10; ++i)
     foo();
 #pragma omp parallel for reduction(|| : argc ? i : argc) // expected-error 2 {{expected variable name, array element or array section}}
@@ -227,7 +227,7 @@ int main(int argc, char **argv) {
 #pragma omp parallel for reduction(foo : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{incorrect reduction identifier, expected one of '+', '-', '*', '&', '|', '^', '&&', '||', 'min' or 'max'}}
   for (int i = 0; i < 10; ++i)
     foo();
-#pragma omp parallel for reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel for reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int i = 0; i < 10; ++i)
     foo();
 #pragma omp parallel for reduction(|| : argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name, array element or array section}}

diff --git a/test/OpenMP/parallel_for_simd_aligned_messages.cpp b/test/OpenMP/parallel_for_simd_aligned_messages.cpp
index 3849f60f96a23dc0133d6b129579fd7c3184fea6..2ccdf0697624ed8d4e89bd64ce51fd10db9d3aff 100644 (file)
--- a/test/OpenMP/parallel_for_simd_aligned_messages.cpp
+++ b/test/OpenMP/parallel_for_simd_aligned_messages.cpp
@@ -119,7 +119,7 @@ template<class I, class C> int foomain(I argc, C **argv) {
   for (I k = 0; k < argc; ++k) ++k;
   #pragma omp parallel for simd aligned (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (I k = 0; k < argc; ++k) ++k;
-  #pragma omp parallel for simd aligned (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp parallel for simd aligned (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (I k = 0; k < argc; ++k) ++k;
   #pragma omp parallel for simd aligned (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   for (I k = 0; k < argc; ++k) ++k;
@@ -177,7 +177,7 @@ int main(int argc, char **argv) {
   #pragma omp parallel for simd aligned (argv // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
   // expected-error@+1 {{argument of aligned clause should be array, pointer, reference to array or reference to pointer, not 'int'}}
-  #pragma omp parallel for simd aligned (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp parallel for simd aligned (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp parallel for simd aligned (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   for (int k = 0; k < argc; ++k) ++k;

diff --git a/test/OpenMP/parallel_for_simd_copyin_messages.cpp b/test/OpenMP/parallel_for_simd_copyin_messages.cpp
index a5e673ba562e8d8c08f1a3d461ae888f997d3ddc..1e6fdc9c31b1c793a92b4f6abc74521a65d92277 100644 (file)
--- a/test/OpenMP/parallel_for_simd_copyin_messages.cpp
+++ b/test/OpenMP/parallel_for_simd_copyin_messages.cpp
@@ -72,7 +72,7 @@ int main(int argc, char **argv) {
 #pragma omp parallel for simd copyin(k // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
-#pragma omp parallel for simd copyin(h, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel for simd copyin(h, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel for simd copyin(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}

diff --git a/test/OpenMP/parallel_for_simd_firstprivate_messages.cpp b/test/OpenMP/parallel_for_simd_firstprivate_messages.cpp
index 6f2288308adbfbcc9d77b0afa8879a1c9d41041b..7a08572f7d1a9d1ba1154f2c0271b120fefad5d0 100644 (file)
--- a/test/OpenMP/parallel_for_simd_firstprivate_messages.cpp
+++ b/test/OpenMP/parallel_for_simd_firstprivate_messages.cpp
@@ -78,7 +78,7 @@ int foomain(int argc, char **argv) {
 #pragma omp parallel for simd firstprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp parallel for simd firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel for simd firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel for simd firstprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
@@ -165,7 +165,7 @@ int main(int argc, char **argv) {
 #pragma omp parallel for simd firstprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
-#pragma omp parallel for simd firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel for simd firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel for simd firstprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}

diff --git a/test/OpenMP/parallel_for_simd_lastprivate_messages.cpp b/test/OpenMP/parallel_for_simd_lastprivate_messages.cpp
index b08b78f89f5cf1ec1d7d8399dc5474070e713882..bd1a6d50557249e3e88617410e2157f78517770e 100644 (file)
--- a/test/OpenMP/parallel_for_simd_lastprivate_messages.cpp
+++ b/test/OpenMP/parallel_for_simd_lastprivate_messages.cpp
@@ -79,7 +79,7 @@ int foomain(int argc, char **argv) {
 #pragma omp parallel for simd lastprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp parallel for simd lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel for simd lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel for simd lastprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
@@ -156,7 +156,7 @@ int main(int argc, char **argv) {
 #pragma omp parallel for simd lastprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
-#pragma omp parallel for simd lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel for simd lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel for simd lastprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}

diff --git a/test/OpenMP/parallel_for_simd_linear_messages.cpp b/test/OpenMP/parallel_for_simd_linear_messages.cpp
index 2027431813e74a9ef4c991045c9f917440f39c00..fc1895a36854aaba71abf6f8f1205d3da9c5e48f 100644 (file)
--- a/test/OpenMP/parallel_for_simd_linear_messages.cpp
+++ b/test/OpenMP/parallel_for_simd_linear_messages.cpp
@@ -111,7 +111,7 @@ template<class I, class C> int foomain(I argc, C **argv) {
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp parallel for simd linear (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp parallel for simd linear (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp parallel for simd linear (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp parallel for simd linear (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   for (int k = 0; k < argc; ++k) ++k;
@@ -175,7 +175,7 @@ int main(int argc, char **argv) {
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp parallel for simd linear (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp parallel for simd linear (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp parallel for simd linear (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp parallel for simd linear (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   for (int k = 0; k < argc; ++k) ++k;

diff --git a/test/OpenMP/parallel_for_simd_misc_messages.c b/test/OpenMP/parallel_for_simd_misc_messages.c
index 652a34b836aaad315b82217e101b6f2d0b26b11e..378c48ff8a4c4b2b9ae9398d57222d259b908590 100644 (file)
--- a/test/OpenMP/parallel_for_simd_misc_messages.c
+++ b/test/OpenMP/parallel_for_simd_misc_messages.c
@@ -386,10 +386,12 @@ void test_linear() {
 #pragma omp parallel for simd linear(
   for (i = 0; i < 16; ++i)
     ;
+// expected-error@+2 {{expected expression}}
 // expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
 #pragma omp parallel for simd linear(,
   for (i = 0; i < 16; ++i)
     ;
+// expected-error@+2 {{expected expression}}
 // expected-error@+1 {{expected expression}}
 #pragma omp parallel for simd linear(, )
   for (i = 0; i < 16; ++i)
@@ -489,10 +491,12 @@ void test_aligned() {
 #pragma omp parallel for simd aligned(
   for (i = 0; i < 16; ++i)
     ;
+// expected-error@+2 {{expected expression}}
 // expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
 #pragma omp parallel for simd aligned(,
   for (i = 0; i < 16; ++i)
     ;
+// expected-error@+2 {{expected expression}}
 // expected-error@+1 {{expected expression}}
 #pragma omp parallel for simd aligned(, )
   for (i = 0; i < 16; ++i)
@@ -589,12 +593,12 @@ void test_private() {
     ;
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp parallel for simd private(,
   for (i = 0; i < 16; ++i)
     ;
 #pragma omp parallel
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp parallel for simd private(, )
   for (i = 0; i < 16; ++i)
     ;
@@ -641,12 +645,12 @@ void test_lastprivate() {
 
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp parallel for simd lastprivate(,
   for (i = 0; i < 16; ++i)
     ;
 #pragma omp parallel
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp parallel for simd lastprivate(, )
   for (i = 0; i < 16; ++i)
     ;
@@ -692,12 +696,12 @@ void test_firstprivate() {
 
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp parallel for simd firstprivate(,
   for (i = 0; i < 16; ++i)
     ;
 #pragma omp parallel
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp parallel for simd firstprivate(, )
   for (i = 0; i < 16; ++i)
     ;

diff --git a/test/OpenMP/parallel_for_simd_private_messages.cpp b/test/OpenMP/parallel_for_simd_private_messages.cpp
index 0b3df2d34331637a59b68dbdeccaefd2c3023098..a33b35d57d1efc4efe4603f321ebdc1c93341986 100644 (file)
--- a/test/OpenMP/parallel_for_simd_private_messages.cpp
+++ b/test/OpenMP/parallel_for_simd_private_messages.cpp
@@ -108,7 +108,7 @@ int foomain(I argc, C **argv) {
 #pragma omp parallel for simd private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp parallel for simd private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel for simd private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel for simd private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
@@ -183,7 +183,7 @@ int main(int argc, char **argv) {
 #pragma omp parallel for simd private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp parallel for simd private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel for simd private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel for simd private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}

diff --git a/test/OpenMP/parallel_for_simd_reduction_messages.cpp b/test/OpenMP/parallel_for_simd_reduction_messages.cpp
index 3080e2a3910f845b861fb2b6836f993c24217cf7..afb0b367c419352626d604a7f23dfe7ffebff69f 100644 (file)
--- a/test/OpenMP/parallel_for_simd_reduction_messages.cpp
+++ b/test/OpenMP/parallel_for_simd_reduction_messages.cpp
@@ -105,7 +105,7 @@ T tmain(T argc) {
 #pragma omp parallel for simd reduction(& : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
   for (int i = 0; i < 10; ++i)
     foo();
-#pragma omp parallel for simd reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
+#pragma omp parallel for simd reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
   for (int i = 0; i < 10; ++i)
     foo();
 #pragma omp parallel for simd reduction(|| : argc ? i : argc) // expected-error 2 {{expected variable name, array element or array section}}
@@ -227,7 +227,7 @@ int main(int argc, char **argv) {
 #pragma omp parallel for simd reduction(foo : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{incorrect reduction identifier, expected one of '+', '-', '*', '&', '|', '^', '&&', '||', 'min' or 'max'}}
   for (int i = 0; i < 10; ++i)
     foo();
-#pragma omp parallel for simd reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel for simd reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int i = 0; i < 10; ++i)
     foo();
 #pragma omp parallel for simd reduction(|| : argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name, array element or array section}}

diff --git a/test/OpenMP/parallel_private_messages.cpp b/test/OpenMP/parallel_private_messages.cpp
index 43f092fcab934a325e7929e202149145637a0f0c..ab535b475265d840a0c29e93fb6c228c77ae3cb3 100644 (file)
--- a/test/OpenMP/parallel_private_messages.cpp
+++ b/test/OpenMP/parallel_private_messages.cpp
@@ -60,7 +60,7 @@ int main(int argc, char **argv) {
   #pragma omp parallel private ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   #pragma omp parallel private () // expected-error {{expected expression}}
   #pragma omp parallel private (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
-  #pragma omp parallel private (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp parallel private (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   #pragma omp parallel private (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   #pragma omp parallel private (argc argv) // expected-error {{expected ',' or ')' in 'private' clause}}
   #pragma omp parallel private (S1) // expected-error {{'S1' does not refer to a value}}

diff --git a/test/OpenMP/parallel_reduction_messages.cpp b/test/OpenMP/parallel_reduction_messages.cpp
index 87092567561cddf423a092d202caa90fb5ec372a..af1f5ed7bc0d9e709b4f1d2340baff636f7281d6 100644 (file)
--- a/test/OpenMP/parallel_reduction_messages.cpp
+++ b/test/OpenMP/parallel_reduction_messages.cpp
@@ -97,7 +97,7 @@ T tmain(T argc) {
   foo();
 #pragma omp parallel reduction(& : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
   foo();
-#pragma omp parallel reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
+#pragma omp parallel reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
   foo();
 #pragma omp parallel reduction(|| : argc ? i : argc) // expected-error 2 {{expected variable name, array element or array section}}
   foo();
@@ -192,7 +192,7 @@ int main(int argc, char **argv) {
   foo();
 #pragma omp parallel reduction(foo : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{incorrect reduction identifier, expected one of '+', '-', '*', '&', '|', '^', '&&', '||', 'min' or 'max'}}
   foo();
-#pragma omp parallel reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
 #pragma omp parallel reduction(|| : argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name, array element or array section}}
   foo();

diff --git a/test/OpenMP/parallel_sections_copyin_messages.cpp b/test/OpenMP/parallel_sections_copyin_messages.cpp
index d8a34bad21ba607d7cf7236fb810d913357b2837..62b5d05db0653e95283574b1568d72a975cb8b68 100644 (file)
--- a/test/OpenMP/parallel_sections_copyin_messages.cpp
+++ b/test/OpenMP/parallel_sections_copyin_messages.cpp
@@ -76,7 +76,7 @@ int main(int argc, char **argv) {
   {
     foo();
   }
-#pragma omp parallel sections copyin(h, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel sections copyin(h, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   {
     foo();
   }

diff --git a/test/OpenMP/parallel_sections_firstprivate_messages.cpp b/test/OpenMP/parallel_sections_firstprivate_messages.cpp
index 8327ea82a67165b5dd1906fb17eac9394ffab64c..b733aabb7f2528ba8ba234afc1d165da61488f30 100644 (file)
--- a/test/OpenMP/parallel_sections_firstprivate_messages.cpp
+++ b/test/OpenMP/parallel_sections_firstprivate_messages.cpp
@@ -82,7 +82,7 @@ int foomain(int argc, char **argv) {
   {
     foo();
   }
-#pragma omp parallel sections firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel sections firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   {
     foo();
   }
@@ -188,7 +188,7 @@ int main(int argc, char **argv) {
   {
     foo();
   }
-#pragma omp parallel sections firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel sections firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   {
     foo();
   }

diff --git a/test/OpenMP/parallel_sections_lastprivate_messages.cpp b/test/OpenMP/parallel_sections_lastprivate_messages.cpp
index 9fe467dd9c83d6801e7c3af174433b6da5e89697..af3c5e2a575ba57160cdb4df7ca4810a922e99f2 100644 (file)
--- a/test/OpenMP/parallel_sections_lastprivate_messages.cpp
+++ b/test/OpenMP/parallel_sections_lastprivate_messages.cpp
@@ -83,7 +83,7 @@ int foomain(int argc, char **argv) {
   {
     foo();
   }
-#pragma omp parallel sections lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel sections lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   {
     foo();
   }
@@ -175,7 +175,7 @@ int main(int argc, char **argv) {
   {
     foo();
   }
-#pragma omp parallel sections lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel sections lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   {
     foo();
   }

diff --git a/test/OpenMP/parallel_sections_misc_messages.c b/test/OpenMP/parallel_sections_misc_messages.c
index a2021876a019f2b82423ad07c20e7bb25b264d63..203d12c52aabe23fffb2186acc1e666301a61bba 100644 (file)
--- a/test/OpenMP/parallel_sections_misc_messages.c
+++ b/test/OpenMP/parallel_sections_misc_messages.c
@@ -115,12 +115,12 @@ void test_private() {
     foo();
   }
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp parallel sections private(,
   {
     foo();
   }
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp parallel sections private(, )
   {
     foo();
@@ -166,12 +166,12 @@ void test_lastprivate() {
   }
 
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp parallel sections lastprivate(,
   {
     foo();
   }
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp parallel sections lastprivate(, )
   {
     foo();
@@ -217,12 +217,12 @@ void test_firstprivate() {
   }
 
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp parallel sections firstprivate(,
   {
     foo();
   }
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp parallel sections firstprivate(, )
   {
     foo();

diff --git a/test/OpenMP/parallel_sections_private_messages.cpp b/test/OpenMP/parallel_sections_private_messages.cpp
index 715dffe5d5f02c9b7eb75fa3cb3994567971bf8d..40b0138b539677e39b78479564d7e01c220d64fb 100644 (file)
--- a/test/OpenMP/parallel_sections_private_messages.cpp
+++ b/test/OpenMP/parallel_sections_private_messages.cpp
@@ -124,7 +124,7 @@ int foomain(I argc, C **argv) {
   {
     foo();
   }
-#pragma omp parallel sections private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel sections private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   {
     foo();
   }
@@ -214,7 +214,7 @@ int main(int argc, char **argv) {
   {
     foo();
   }
-#pragma omp parallel sections private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel sections private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   {
     foo();
   }

diff --git a/test/OpenMP/parallel_sections_reduction_messages.cpp b/test/OpenMP/parallel_sections_reduction_messages.cpp
index 8b72f9905a694a80eacbfc24862e74498bb9f213..52d4cb9cdcb653b6cbdccf4839c34e19d283ce85 100644 (file)
--- a/test/OpenMP/parallel_sections_reduction_messages.cpp
+++ b/test/OpenMP/parallel_sections_reduction_messages.cpp
@@ -113,7 +113,7 @@ T tmain(T argc) {
   {
     foo();
   }
-#pragma omp parallel sections reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
+#pragma omp parallel sections reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
   {
     foo();
   }
@@ -266,7 +266,7 @@ int main(int argc, char **argv) {
   {
     foo();
   }
-#pragma omp parallel sections reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel sections reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   {
     foo();
   }

diff --git a/test/OpenMP/parallel_sections_shared_messages.cpp b/test/OpenMP/parallel_sections_shared_messages.cpp
index c0275835cf977f2b1830cca0439ac9fa603cd36e..2b835971111926af2b9aab6110a4467d90a2a0e5 100644 (file)
--- a/test/OpenMP/parallel_sections_shared_messages.cpp
+++ b/test/OpenMP/parallel_sections_shared_messages.cpp
@@ -71,7 +71,7 @@ int main(int argc, char **argv) {
   { foo(); }
 #pragma omp parallel sections shared(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   { foo(); }
-#pragma omp parallel sections shared(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp parallel sections shared(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   { foo(); }
 #pragma omp parallel sections shared(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   { foo(); }

diff --git a/test/OpenMP/parallel_shared_messages.cpp b/test/OpenMP/parallel_shared_messages.cpp
index 5a87ae7d80f0272931b4232f829fb6f3f3264955..f6f4573a66938c988c8ff3214474b6a874fc88e5 100644 (file)
--- a/test/OpenMP/parallel_shared_messages.cpp
+++ b/test/OpenMP/parallel_shared_messages.cpp
@@ -63,7 +63,7 @@ int main(int argc, char **argv) {
   #pragma omp parallel shared ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   #pragma omp parallel shared () // expected-error {{expected expression}}
   #pragma omp parallel shared (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
-  #pragma omp parallel shared (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp parallel shared (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   #pragma omp parallel shared (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   #pragma omp parallel shared (argc)
   #pragma omp parallel shared (S1) // expected-error {{'S1' does not refer to a value}}

diff --git a/test/OpenMP/sections_firstprivate_messages.cpp b/test/OpenMP/sections_firstprivate_messages.cpp
index bd332dddbb989f0d36804aa70a281881604edac5..cd2b4b883873a00144f11d551e43ac6c750d4a3d 100644 (file)
--- a/test/OpenMP/sections_firstprivate_messages.cpp
+++ b/test/OpenMP/sections_firstprivate_messages.cpp
@@ -87,7 +87,7 @@ int foomain(int argc, char **argv) {
     foo();
   }
 #pragma omp parallel
-#pragma omp sections firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp sections firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   {
     foo();
   }
@@ -208,7 +208,7 @@ int main(int argc, char **argv) {
     foo();
   }
 #pragma omp parallel
-#pragma omp sections firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp sections firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   {
     foo();
   }

diff --git a/test/OpenMP/sections_lastprivate_messages.cpp b/test/OpenMP/sections_lastprivate_messages.cpp
index 1bd4706f45002a0fb772d886300c3ddcde7b2968..5f6b420cb8ea16436ba73945bc8b428ff5bc668d 100644 (file)
--- a/test/OpenMP/sections_lastprivate_messages.cpp
+++ b/test/OpenMP/sections_lastprivate_messages.cpp
@@ -88,7 +88,7 @@ int foomain(int argc, char **argv) {
     foo();
   }
 #pragma omp parallel
-#pragma omp sections lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp sections lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   {
     foo();
   }
@@ -194,7 +194,7 @@ int main(int argc, char **argv) {
     foo();
   }
 #pragma omp parallel
-#pragma omp sections lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp sections lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   {
     foo();
   }

diff --git a/test/OpenMP/sections_misc_messages.c b/test/OpenMP/sections_misc_messages.c
index 5d18a9c040bd3c7a10a63cdf56ca7b685739885b..da20aa18aa12206ac440aaee23d7f093c0662272 100644 (file)
--- a/test/OpenMP/sections_misc_messages.c
+++ b/test/OpenMP/sections_misc_messages.c
@@ -122,13 +122,13 @@ void test_private() {
   }
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp sections private(,
   {
     foo();
   }
 #pragma omp parallel
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp sections private(, )
   {
     foo();
@@ -182,13 +182,13 @@ void test_lastprivate() {
 
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp sections lastprivate(,
   {
     foo();
   }
 #pragma omp parallel
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp sections lastprivate(, )
   {
     foo();
@@ -242,13 +242,13 @@ void test_firstprivate() {
 
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp sections firstprivate(,
   {
     foo();
   }
 #pragma omp parallel
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp sections firstprivate(, )
   {
     foo();

diff --git a/test/OpenMP/sections_private_messages.cpp b/test/OpenMP/sections_private_messages.cpp
index 2855a7de12b28d24c31f245017a604af8c462589..27bb3136e72019a5ba8cbaa52fe366ec9febc121 100644 (file)
--- a/test/OpenMP/sections_private_messages.cpp
+++ b/test/OpenMP/sections_private_messages.cpp
@@ -124,7 +124,7 @@ int foomain(I argc, C **argv) {
   {
     foo();
   }
-#pragma omp sections private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp sections private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   {
     foo();
   }
@@ -214,7 +214,7 @@ int main(int argc, char **argv) {
   {
     foo();
   }
-#pragma omp sections private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp sections private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   {
     foo();
   }

diff --git a/test/OpenMP/sections_reduction_messages.cpp b/test/OpenMP/sections_reduction_messages.cpp
index a050cee67fdcb36d22d567b1038b3faa57cb9e82..134bf619c911392be8f1395e0670233744bdddc9 100644 (file)
--- a/test/OpenMP/sections_reduction_messages.cpp
+++ b/test/OpenMP/sections_reduction_messages.cpp
@@ -122,7 +122,7 @@ T tmain(T argc) {
     foo();
   }
 #pragma omp parallel
-#pragma omp sections reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
+#pragma omp sections reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
   {
     foo();
   }
@@ -302,7 +302,7 @@ int main(int argc, char **argv) {
     foo();
   }
 #pragma omp parallel
-#pragma omp sections reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp sections reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   {
     foo();
   }

diff --git a/test/OpenMP/simd_aligned_messages.cpp b/test/OpenMP/simd_aligned_messages.cpp
index d1a8997a658db5aa284a9b6f7ec8262fdb4de51b..9515a0bca68f13236b394fc6ae7877c4c2baa06b 100644 (file)
--- a/test/OpenMP/simd_aligned_messages.cpp
+++ b/test/OpenMP/simd_aligned_messages.cpp
@@ -119,7 +119,7 @@ template<class I, class C> int foomain(I argc, C **argv) {
   for (I k = 0; k < argc; ++k) ++k;
   #pragma omp simd aligned (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (I k = 0; k < argc; ++k) ++k;
-  #pragma omp simd aligned (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp simd aligned (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (I k = 0; k < argc; ++k) ++k;
   #pragma omp simd aligned (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   for (I k = 0; k < argc; ++k) ++k;
@@ -177,7 +177,7 @@ int main(int argc, char **argv) {
   #pragma omp simd aligned (argv // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
   // expected-error@+1 {{argument of aligned clause should be array, pointer, reference to array or reference to pointer, not 'int'}}
-  #pragma omp simd aligned (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp simd aligned (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp simd aligned (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   for (int k = 0; k < argc; ++k) ++k;

diff --git a/test/OpenMP/simd_lastprivate_messages.cpp b/test/OpenMP/simd_lastprivate_messages.cpp
index 99a2fd0bd7569374143ce9e289f1a7e3e19d0569..16223db71ad573dcb3a659e760ad34c390c84d97 100644 (file)
--- a/test/OpenMP/simd_lastprivate_messages.cpp
+++ b/test/OpenMP/simd_lastprivate_messages.cpp
@@ -79,7 +79,7 @@ int foomain(I argc, C **argv) {
 #pragma omp simd lastprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp simd lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp simd lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp simd lastprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
@@ -147,7 +147,7 @@ int main(int argc, char **argv) {
 #pragma omp simd lastprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
-#pragma omp simd lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp simd lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp simd lastprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}

diff --git a/test/OpenMP/simd_linear_messages.cpp b/test/OpenMP/simd_linear_messages.cpp
index 7b1698368fb0ec78257c949d3b80428c37a37b53..792f78aa3db6e3dfa3dad51117df050103fea247 100644 (file)
--- a/test/OpenMP/simd_linear_messages.cpp
+++ b/test/OpenMP/simd_linear_messages.cpp
@@ -121,7 +121,7 @@ template<class I, class C> int foomain(I argc, C **argv) {
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp simd linear (val argc // expected-error {{use of undeclared identifier 'val'}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp simd linear (val(argc, // expected-error 2 {{expected ')'}} expected-note 2 {{to match this '('}}
+  #pragma omp simd linear (val(argc, // expected-error {{expected expression}} expected-error 2 {{expected ')'}} expected-note 2 {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp simd linear (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   for (int k = 0; k < argc; ++k) ++k;
@@ -210,7 +210,7 @@ int main(int argc, char **argv) {
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp simd linear (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp simd linear (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp simd linear (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp simd linear (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   for (int k = 0; k < argc; ++k) ++k;

diff --git a/test/OpenMP/simd_misc_messages.c b/test/OpenMP/simd_misc_messages.c
index 1d6a0d9a0456da4a6d351b28126e70925da33f0b..1e15482919473340db1a00ee9d55c2b6b36e17e1 100644 (file)
--- a/test/OpenMP/simd_misc_messages.c
+++ b/test/OpenMP/simd_misc_messages.c
@@ -376,10 +376,12 @@ void test_linear() {
 #pragma omp simd linear(
   for (i = 0; i < 16; ++i)
     ;
+// expected-error@+2 {{expected expression}}
 // expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
 #pragma omp simd linear(,
   for (i = 0; i < 16; ++i)
     ;
+// expected-error@+2 {{expected expression}}
 // expected-error@+1 {{expected expression}}
 #pragma omp simd linear(, )
   for (i = 0; i < 16; ++i)
@@ -478,10 +480,12 @@ void test_aligned() {
 #pragma omp simd aligned(
   for (i = 0; i < 16; ++i)
     ;
+// expected-error@+2 {{expected expression}}
 // expected-error@+1 {{expected expression}} expected-error@+1 {{expected ')'}} expected-note@+1 {{to match this '('}}
 #pragma omp simd aligned(,
   for (i = 0; i < 16; ++i)
     ;
+// expected-error@+2 {{expected expression}}
 // expected-error@+1 {{expected expression}}
 #pragma omp simd aligned(, )
   for (i = 0; i < 16; ++i)
@@ -575,11 +579,11 @@ void test_private() {
   for (i = 0; i < 16; ++i)
     ;
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp simd private(,
   for (i = 0; i < 16; ++i)
     ;
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp simd private(, )
   for (i = 0; i < 16; ++i)
     ;
@@ -628,11 +632,11 @@ void test_lastprivate() {
     ;
 
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp simd lastprivate(,
   for (i = 0; i < 16; ++i)
     ;
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp simd lastprivate(, )
   for (i = 0; i < 16; ++i)
     ;

diff --git a/test/OpenMP/simd_private_messages.cpp b/test/OpenMP/simd_private_messages.cpp
index de2c34fb0352cf537cf7619db959d50e1286153d..1850101891f7e45ba40c6cb54cc48f37e820c7ef 100644 (file)
--- a/test/OpenMP/simd_private_messages.cpp
+++ b/test/OpenMP/simd_private_messages.cpp
@@ -99,7 +99,7 @@ template<class I, class C> int foomain(I argc, C **argv) {
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp simd private (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp simd private (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp simd private (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp simd private (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   for (int k = 0; k < argc; ++k) ++k;
@@ -156,7 +156,7 @@ int main(int argc, char **argv) {
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp simd private (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp simd private (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp simd private (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp simd private (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   for (int k = 0; k < argc; ++k) ++k;

diff --git a/test/OpenMP/simd_reduction_messages.cpp b/test/OpenMP/simd_reduction_messages.cpp
index ee832fd0366270f763437763cfce612c2528bfe5..c47d53eb9185e96ce42c3049afd8eb71fd26ca40 100644 (file)
--- a/test/OpenMP/simd_reduction_messages.cpp
+++ b/test/OpenMP/simd_reduction_messages.cpp
@@ -105,7 +105,7 @@ T tmain(T argc) {
 #pragma omp simd reduction(& : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
   for (int i = 0; i < 10; ++i)
     foo();
-#pragma omp simd reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
+#pragma omp simd reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
   for (int i = 0; i < 10; ++i)
     foo();
 #pragma omp simd reduction(|| : argc ? i : argc) // expected-error 2 {{expected variable name, array element or array section}}
@@ -230,7 +230,7 @@ int main(int argc, char **argv) {
 #pragma omp simd reduction(foo : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{incorrect reduction identifier, expected one of '+', '-', '*', '&', '|', '^', '&&', '||', 'min' or 'max'}}
   for (int i = 0; i < 10; ++i)
     foo();
-#pragma omp simd reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp simd reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int i = 0; i < 10; ++i)
     foo();
 #pragma omp simd reduction(|| : argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name, array element or array section}}

diff --git a/test/OpenMP/single_copyprivate_messages.cpp b/test/OpenMP/single_copyprivate_messages.cpp
index 86188fec674d4ff14b9ed916d0d7933810e37e73..4714753f494e07a4ecbad03caa58e8acd0e0f890 100644 (file)
--- a/test/OpenMP/single_copyprivate_messages.cpp
+++ b/test/OpenMP/single_copyprivate_messages.cpp
@@ -54,7 +54,7 @@ T tmain(T argc, C **argv) {
 #pragma omp parallel
 #pragma omp single copyprivate(k // expected-error {{expected ')'}} expected-note {{to match this '('}}
 #pragma omp parallel
-#pragma omp single copyprivate(h, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp single copyprivate(h, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
 #pragma omp parallel
 #pragma omp single copyprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
 #pragma omp parallel
@@ -130,7 +130,7 @@ int main(int argc, char **argv) {
 #pragma omp parallel
 #pragma omp single copyprivate(k // expected-error {{expected ')'}} expected-note {{to match this '('}}
 #pragma omp parallel
-#pragma omp single copyprivate(h, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp single copyprivate(h, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
 #pragma omp parallel
 #pragma omp single copyprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
 #pragma omp parallel

diff --git a/test/OpenMP/single_firstprivate_messages.cpp b/test/OpenMP/single_firstprivate_messages.cpp
index 4e799458deae737f571b4d6ce4002fb47783d1e8..32de9fdc880673a12d6ef31bb77a9a6ee9f7cae8 100644 (file)
--- a/test/OpenMP/single_firstprivate_messages.cpp
+++ b/test/OpenMP/single_firstprivate_messages.cpp
@@ -79,7 +79,7 @@ int foomain(int argc, char **argv) {
 #pragma omp single firstprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
 #pragma omp parallel
-#pragma omp single firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp single firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
 #pragma omp parallel
 #pragma omp single firstprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
@@ -162,7 +162,7 @@ int main(int argc, char **argv) {
 #pragma omp single firstprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
 #pragma omp parallel
-#pragma omp single firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp single firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
 #pragma omp parallel
 #pragma omp single firstprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}

diff --git a/test/OpenMP/single_misc_messages.c b/test/OpenMP/single_misc_messages.c
index feec869dee6208106788e3e31a3ae870b09fa952..2c922ddfd4f04377505ff90fc726d37ec484750d 100644 (file)
--- a/test/OpenMP/single_misc_messages.c
+++ b/test/OpenMP/single_misc_messages.c
@@ -86,11 +86,11 @@ void test_private() {
   foo();
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp single private(,
   foo();
 #pragma omp parallel
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp single private(, )
   foo();
 #pragma omp parallel
@@ -128,11 +128,11 @@ void test_firstprivate() {
 
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp single firstprivate(,
   foo();
 #pragma omp parallel
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp single firstprivate(, )
   foo();
 #pragma omp parallel

diff --git a/test/OpenMP/single_private_messages.cpp b/test/OpenMP/single_private_messages.cpp
index 1a2ba3f2d198a82a9fceded602b8ca52dda86858..0ed0e6cfb0999ce2a6dde94b0e702d7e79dd0191 100644 (file)
--- a/test/OpenMP/single_private_messages.cpp
+++ b/test/OpenMP/single_private_messages.cpp
@@ -104,7 +104,7 @@ int foomain(I argc, C **argv) {
   foo();
 #pragma omp single private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
-#pragma omp single private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp single private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
 #pragma omp single private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   foo();
@@ -162,7 +162,7 @@ int main(int argc, char **argv) {
   foo();
 #pragma omp single private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
-#pragma omp single private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp single private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
 #pragma omp single private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   foo();

diff --git a/test/OpenMP/target_firstprivate_messages.cpp b/test/OpenMP/target_firstprivate_messages.cpp
index f26ea62f62ea46f7e32df9a06792369f24a9e8a6..6dbad671de7c6510174927eadc8896e0aaa93143 100644 (file)
--- a/test/OpenMP/target_firstprivate_messages.cpp
+++ b/test/OpenMP/target_firstprivate_messages.cpp
@@ -97,7 +97,7 @@ int foomain(I argc, C **argv) {
 {}
 #pragma omp target firstprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
 {}
-#pragma omp target firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
 {}
 #pragma omp target firstprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
 {}
@@ -157,7 +157,7 @@ int main(int argc, char **argv) {
 {}
 #pragma omp target firstprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
 {}
-#pragma omp target firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
 {}
 #pragma omp target firstprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
 {}

diff --git a/test/OpenMP/target_map_messages.cpp b/test/OpenMP/target_map_messages.cpp
index 9ac299a43b7a397bbcd64b66e8768b6cda3d272a..baa0751abcd20acc43ab87a4c8cb7829851323e1 100644 (file)
--- a/test/OpenMP/target_map_messages.cpp
+++ b/test/OpenMP/target_map_messages.cpp
@@ -368,7 +368,7 @@ T tmain(T argc) {
   {}
 #pragma omp target map(to:) // expected-error {{expected expression}}
   {}
-#pragma omp target map(from: argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target map(from: argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   {}
 #pragma omp target map(x: y) // expected-error {{incorrect map type, expected one of 'to', 'from', 'tofrom', 'alloc', 'release', or 'delete'}}
   {}
@@ -452,7 +452,7 @@ int main(int argc, char **argv) {
 #pragma omp target data map(alloc) // expected-error {{use of undeclared identifier 'alloc'}}
 #pragma omp target data map(to argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{expected ',' or ')' in 'map' clause}}
 #pragma omp target data map(to:) // expected-error {{expected expression}}
-#pragma omp target data map(from: argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target data map(from: argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
 #pragma omp target data map(x: y) // expected-error {{incorrect map type, expected one of 'to', 'from', 'tofrom', 'alloc', 'release', or 'delete'}}
 #pragma omp target map(x)
   foo();

diff --git a/test/OpenMP/target_parallel_firstprivate_messages.cpp b/test/OpenMP/target_parallel_firstprivate_messages.cpp
index 15d60b24b1968ada4f9bae5810519b48f8bddb6e..dd6825aa251f9b4d9071a8496108097583357e32 100644 (file)
--- a/test/OpenMP/target_parallel_firstprivate_messages.cpp
+++ b/test/OpenMP/target_parallel_firstprivate_messages.cpp
@@ -71,7 +71,7 @@ int main(int argc, char **argv) {
   foo();
   #pragma omp target parallel firstprivate (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
-  #pragma omp target parallel firstprivate (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp target parallel firstprivate (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
   #pragma omp target parallel firstprivate (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   foo();

diff --git a/test/OpenMP/target_parallel_for_firstprivate_messages.cpp b/test/OpenMP/target_parallel_for_firstprivate_messages.cpp
index 103023c2ba15c54da5681d7fdcb94fbb3c42fb2a..36bfe25e94682a20b40f6033ec1fe869c5006565 100644 (file)
--- a/test/OpenMP/target_parallel_for_firstprivate_messages.cpp
+++ b/test/OpenMP/target_parallel_for_firstprivate_messages.cpp
@@ -78,7 +78,7 @@ int foomain(int argc, char **argv) {
 #pragma omp target parallel for firstprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp target parallel for firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target parallel for firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp target parallel for firstprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
@@ -163,7 +163,7 @@ int main(int argc, char **argv) {
 #pragma omp target parallel for firstprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
-#pragma omp target parallel for firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target parallel for firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp target parallel for firstprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}

diff --git a/test/OpenMP/target_parallel_for_lastprivate_messages.cpp b/test/OpenMP/target_parallel_for_lastprivate_messages.cpp
index dff72c1b13b9b2bd9d714a8e593ec5b8616bef62..c001b7f0d168524173ab7fa8b6962a42bc755075 100644 (file)
--- a/test/OpenMP/target_parallel_for_lastprivate_messages.cpp
+++ b/test/OpenMP/target_parallel_for_lastprivate_messages.cpp
@@ -80,7 +80,7 @@ int foomain(int argc, char **argv) {
 #pragma omp target parallel for lastprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp target parallel for lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target parallel for lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp target parallel for lastprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
@@ -154,7 +154,7 @@ int main(int argc, char **argv) {
 #pragma omp target parallel for lastprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
-#pragma omp target parallel for lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target parallel for lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp target parallel for lastprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}

diff --git a/test/OpenMP/target_parallel_for_linear_messages.cpp b/test/OpenMP/target_parallel_for_linear_messages.cpp
index ea82ede46abbfd1f143b594168fd265ec5ebd191..36e897d5946e62f7e077002c5299208208952d04 100644 (file)
--- a/test/OpenMP/target_parallel_for_linear_messages.cpp
+++ b/test/OpenMP/target_parallel_for_linear_messages.cpp
@@ -131,7 +131,7 @@ int foomain(I argc, C **argv) {
 #pragma omp target parallel for linear(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp target parallel for linear(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target parallel for linear(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp target parallel for linear(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
@@ -216,7 +216,7 @@ int main(int argc, char **argv) {
 #pragma omp target parallel for linear(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp target parallel for linear(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target parallel for linear(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp target parallel for linear(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}

diff --git a/test/OpenMP/target_parallel_for_map_messages.cpp b/test/OpenMP/target_parallel_for_map_messages.cpp
index f17fbdccc139d3b469808d376271d75669c5e11a..60f2b8008c22e130730210ea2c0f6a7254dc5729 100644 (file)
--- a/test/OpenMP/target_parallel_for_map_messages.cpp
+++ b/test/OpenMP/target_parallel_for_map_messages.cpp
@@ -76,7 +76,7 @@ T tmain(T argc) {
   for (i = 0; i < argc; ++i) foo();
 #pragma omp target parallel for map(to:) // expected-error {{expected expression}}
   for (i = 0; i < argc; ++i) foo();
-#pragma omp target parallel for map(from: argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target parallel for map(from: argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i) foo();
 #pragma omp target parallel for map(x: y) // expected-error {{incorrect map type, expected one of 'to', 'from', 'tofrom', 'alloc', 'release', or 'delete'}}
   for (i = 0; i < argc; ++i) foo();
@@ -192,7 +192,7 @@ int main(int argc, char **argv) {
   for (i = 0; i < argc; ++i) foo();
 #pragma omp target parallel for map(to:) // expected-error {{expected expression}}
   for (i = 0; i < argc; ++i) foo();
-#pragma omp target parallel for map(from: argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target parallel for map(from: argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i) foo();
 #pragma omp target parallel for map(x: y) // expected-error {{incorrect map type, expected one of 'to', 'from', 'tofrom', 'alloc', 'release', or 'delete'}}
   for (i = 0; i < argc; ++i) foo();

diff --git a/test/OpenMP/target_parallel_for_misc_messages.c b/test/OpenMP/target_parallel_for_misc_messages.c
index 2378aae8d82d3c52d2226e30d2f6b3d22bfb9ed7..cfe83f1301075d4f4bba228335c27956cb600049 100644 (file)
--- a/test/OpenMP/target_parallel_for_misc_messages.c
+++ b/test/OpenMP/target_parallel_for_misc_messages.c
@@ -180,11 +180,11 @@ void test_private() {
   for (i = 0; i < 16; ++i)
     ;
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp target parallel for private(,
   for (i = 0; i < 16; ++i)
     ;
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp target parallel for private(, )
   for (i = 0; i < 16; ++i)
     ;
@@ -223,11 +223,11 @@ void test_lastprivate() {
     ;
 
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp target parallel for lastprivate(,
   for (i = 0; i < 16; ++i)
     ;
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp target parallel for lastprivate(, )
   for (i = 0; i < 16; ++i)
     ;
@@ -265,11 +265,11 @@ void test_firstprivate() {
     ;
 
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp target parallel for firstprivate(,
   for (i = 0; i < 16; ++i)
     ;
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp target parallel for firstprivate(, )
   for (i = 0; i < 16; ++i)
     ;

diff --git a/test/OpenMP/target_parallel_for_private_messages.cpp b/test/OpenMP/target_parallel_for_private_messages.cpp
index 9f2439a73c546da1d9ef2ad73fc2523f11075a99..1d6381a1d5d3eb605b4bd61688a676a7fb9edb74 100644 (file)
--- a/test/OpenMP/target_parallel_for_private_messages.cpp
+++ b/test/OpenMP/target_parallel_for_private_messages.cpp
@@ -108,7 +108,7 @@ int foomain(I argc, C **argv) {
 #pragma omp target parallel for private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp target parallel for private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target parallel for private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp target parallel for private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
@@ -180,7 +180,7 @@ int main(int argc, char **argv) {
 #pragma omp target parallel for private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp target parallel for private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target parallel for private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp target parallel for private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}

diff --git a/test/OpenMP/target_parallel_for_reduction_messages.cpp b/test/OpenMP/target_parallel_for_reduction_messages.cpp
index 9a86f2a9fac5e12febbf3003c418372c2473558f..16697a98733b4856d56e0662444d075977ad789f 100644 (file)
--- a/test/OpenMP/target_parallel_for_reduction_messages.cpp
+++ b/test/OpenMP/target_parallel_for_reduction_messages.cpp
@@ -105,7 +105,7 @@ T tmain(T argc) {
 #pragma omp target parallel for reduction(& : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
   for (int i = 0; i < 10; ++i)
     foo();
-#pragma omp target parallel for reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
+#pragma omp target parallel for reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
   for (int i = 0; i < 10; ++i)
     foo();
 #pragma omp target parallel for reduction(|| : argc ? i : argc) // expected-error 2 {{expected variable name, array element or array section}}
@@ -227,7 +227,7 @@ int main(int argc, char **argv) {
 #pragma omp target parallel for reduction(foo : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{incorrect reduction identifier, expected one of '+', '-', '*', '&', '|', '^', '&&', '||', 'min' or 'max'}}
   for (int i = 0; i < 10; ++i)
     foo();
-#pragma omp target parallel for reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target parallel for reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int i = 0; i < 10; ++i)
     foo();
 #pragma omp target parallel for reduction(|| : argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name, array element or array section}}

diff --git a/test/OpenMP/target_parallel_map_messages.cpp b/test/OpenMP/target_parallel_map_messages.cpp
index 414a4714be25a2172cd13a093a638344091f2b48..9d1be5ccaedf61cd4e0c0688fad779ffb4fc90fe 100644 (file)
--- a/test/OpenMP/target_parallel_map_messages.cpp
+++ b/test/OpenMP/target_parallel_map_messages.cpp
@@ -76,7 +76,7 @@ T tmain(T argc) {
   foo();
 #pragma omp target parallel map(to:) // expected-error {{expected expression}}
   foo();
-#pragma omp target parallel map(from: argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target parallel map(from: argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
 #pragma omp target parallel map(x: y) // expected-error {{incorrect map type, expected one of 'to', 'from', 'tofrom', 'alloc', 'release', or 'delete'}}
   foo();
@@ -191,7 +191,7 @@ int main(int argc, char **argv) {
   foo();
 #pragma omp target parallel map(to:) // expected-error {{expected expression}}
   foo();
-#pragma omp target parallel map(from: argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target parallel map(from: argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
 #pragma omp target parallel map(x: y) // expected-error {{incorrect map type, expected one of 'to', 'from', 'tofrom', 'alloc', 'release', or 'delete'}}
   foo();

diff --git a/test/OpenMP/target_parallel_private_messages.cpp b/test/OpenMP/target_parallel_private_messages.cpp
index 77507bc818255f635cbd3843126374b4079141bc..fabd37d4b3950b2bc5dd5a200e98251fb3776779 100644 (file)
--- a/test/OpenMP/target_parallel_private_messages.cpp
+++ b/test/OpenMP/target_parallel_private_messages.cpp
@@ -68,7 +68,7 @@ int foomain(I argc, C **argv) {
 {}
 #pragma omp target parallel private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
 {}
-#pragma omp target parallel private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target parallel private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
 {}
 #pragma omp target parallel private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
 {}
@@ -155,7 +155,7 @@ int main(int argc, char **argv) {
 {}
 #pragma omp target parallel private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
 {}
-#pragma omp target parallel private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target parallel private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
 {}
 #pragma omp target parallel private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
 {}

diff --git a/test/OpenMP/target_parallel_reduction_messages.cpp b/test/OpenMP/target_parallel_reduction_messages.cpp
index 3f7eef068dbe6dd14e54f73a95ef09817356ec1f..c9434e76245b9ba7aee2aadba6aee9a62bf6bb50 100644 (file)
--- a/test/OpenMP/target_parallel_reduction_messages.cpp
+++ b/test/OpenMP/target_parallel_reduction_messages.cpp
@@ -97,7 +97,7 @@ T tmain(T argc) {
   foo();
 #pragma omp target parallel reduction(& : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
   foo();
-#pragma omp target parallel reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
+#pragma omp target parallel reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
   foo();
 #pragma omp target parallel reduction(|| : argc ? i : argc) // expected-error 2 {{expected variable name, array element or array section}}
   foo();
@@ -195,7 +195,7 @@ int main(int argc, char **argv) {
   foo();
 #pragma omp target parallel reduction(foo : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{incorrect reduction identifier, expected one of '+', '-', '*', '&', '|', '^', '&&', '||', 'min' or 'max'}}
   foo();
-#pragma omp target parallel reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target parallel reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
 #pragma omp target parallel reduction(|| : argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name, array element or array section}}
   foo();

diff --git a/test/OpenMP/target_parallel_shared_messages.cpp b/test/OpenMP/target_parallel_shared_messages.cpp
index 4ef4707c3f5ec41fd60f1a3e24d738ac087caa0e..302a09239d341eefc087f868cc89381d75ca2d1a 100644 (file)
--- a/test/OpenMP/target_parallel_shared_messages.cpp
+++ b/test/OpenMP/target_parallel_shared_messages.cpp
@@ -67,7 +67,7 @@ int main(int argc, char **argv) {
   foo();
   #pragma omp target parallel shared (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
-  #pragma omp target parallel shared (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp target parallel shared (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
   #pragma omp target parallel shared (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   foo();

diff --git a/test/OpenMP/target_private_messages.cpp b/test/OpenMP/target_private_messages.cpp
index 7a5c43db4f5dea58a0f3556ef653d2055e1735a2..a093a87056272a674a1948ef6bcdc8269c984f12 100644 (file)
--- a/test/OpenMP/target_private_messages.cpp
+++ b/test/OpenMP/target_private_messages.cpp
@@ -97,7 +97,7 @@ int foomain(I argc, C **argv) {
 {}
 #pragma omp target private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
 {}
-#pragma omp target private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
 {}
 #pragma omp target private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
 {}
@@ -157,7 +157,7 @@ int main(int argc, char **argv) {
 {}
 #pragma omp target private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
 {}
-#pragma omp target private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp target private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
 {}
 #pragma omp target private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
 {}

diff --git a/test/OpenMP/task_firstprivate_messages.cpp b/test/OpenMP/task_firstprivate_messages.cpp
index 4f02ce14bfe52765b8a0c4f232d4cd47c4744f45..ef5f3856430a3643279bd025a87cfeceac06836b 100644 (file)
--- a/test/OpenMP/task_firstprivate_messages.cpp
+++ b/test/OpenMP/task_firstprivate_messages.cpp
@@ -76,7 +76,7 @@ int main(int argc, char **argv) {
 #pragma omp task firstprivate(                              // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
 #pragma omp task firstprivate()                             // expected-error {{expected expression}}
 #pragma omp task firstprivate(argc                          // expected-error {{expected ')'}} expected-note {{to match this '('}}
-#pragma omp task firstprivate(argc,                         // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp task firstprivate(argc,                         // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
 #pragma omp task firstprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
 #pragma omp task firstprivate(argc)
 #pragma omp task firstprivate(S1)            // expected-error {{'S1' does not refer to a value}}

diff --git a/test/OpenMP/task_private_messages.cpp b/test/OpenMP/task_private_messages.cpp
index 10865ca16b65723c1fa02817a8d1df1bb5fde0de..6bce1352b13eb19711ab4bb10fc569e2307c2e8d 100644 (file)
--- a/test/OpenMP/task_private_messages.cpp
+++ b/test/OpenMP/task_private_messages.cpp
@@ -69,7 +69,7 @@ int main(int argc, char **argv) {
 #pragma omp task private(                              // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
 #pragma omp task private()                             // expected-error {{expected expression}}
 #pragma omp task private(argc                          // expected-error {{expected ')'}} expected-note {{to match this '('}}
-#pragma omp task private(argc,                         // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp task private(argc,                         // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
 #pragma omp task private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
 #pragma omp task private(argc argv)                    // expected-error {{expected ',' or ')' in 'private' clause}}
 #pragma omp task private(S1)                           // expected-error {{'S1' does not refer to a value}}

diff --git a/test/OpenMP/task_shared_messages.cpp b/test/OpenMP/task_shared_messages.cpp
index dedf462b70c43f0baf6ccca5fa7608b9889294b2..bf3b8ba283732dc35779baa39e58a92d75f4b9f1 100644 (file)
--- a/test/OpenMP/task_shared_messages.cpp
+++ b/test/OpenMP/task_shared_messages.cpp
@@ -71,7 +71,7 @@ int main(int argc, char **argv) {
   foo();
 #pragma omp task shared(argc                          // expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
-#pragma omp task shared(argc,                         // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp task shared(argc,                         // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
 #pragma omp task shared(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   foo();

diff --git a/test/OpenMP/taskloop_firstprivate_messages.cpp b/test/OpenMP/taskloop_firstprivate_messages.cpp
index a784bcbaf966f9fa3ec418a0c424a30c81c7fdc8..e2e87e4697a5de77b61a98f466cc5e2bd17af672 100644 (file)
--- a/test/OpenMP/taskloop_firstprivate_messages.cpp
+++ b/test/OpenMP/taskloop_firstprivate_messages.cpp
@@ -83,7 +83,7 @@ int foomain(int argc, char **argv) {
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel
-#pragma omp taskloop firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp taskloop firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel
@@ -189,7 +189,7 @@ int main(int argc, char **argv) {
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel
-#pragma omp taskloop firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp taskloop firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel

diff --git a/test/OpenMP/taskloop_lastprivate_messages.cpp b/test/OpenMP/taskloop_lastprivate_messages.cpp
index b0c9940c8bc4ccd80bdb9f14b81bd606d99abe65..e4364448159c3018e9adadcb934726e55c034e80 100644 (file)
--- a/test/OpenMP/taskloop_lastprivate_messages.cpp
+++ b/test/OpenMP/taskloop_lastprivate_messages.cpp
@@ -85,7 +85,7 @@ int foomain(int argc, char **argv) {
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel
-#pragma omp taskloop lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp taskloop lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel
@@ -179,7 +179,7 @@ int main(int argc, char **argv) {
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel
-#pragma omp taskloop lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp taskloop lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel

diff --git a/test/OpenMP/taskloop_misc_messages.c b/test/OpenMP/taskloop_misc_messages.c
index 21366e6740eb650999688b1dbac6f5f5b954b984..f9e084e0edd1cbf3b275ee34b4c4ba36200f0261 100644 (file)
--- a/test/OpenMP/taskloop_misc_messages.c
+++ b/test/OpenMP/taskloop_misc_messages.c
@@ -206,12 +206,12 @@ void test_private() {
     ;
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp taskloop private(,
   for (i = 0; i < 16; ++i)
     ;
 #pragma omp parallel
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp taskloop private(, )
   for (i = 0; i < 16; ++i)
     ;
@@ -258,12 +258,12 @@ void test_lastprivate() {
 
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp taskloop lastprivate(,
   for (i = 0; i < 16; ++i)
     ;
 #pragma omp parallel
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp taskloop lastprivate(, )
   for (i = 0; i < 16; ++i)
     ;
@@ -309,12 +309,12 @@ void test_firstprivate() {
 
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp taskloop firstprivate(,
   for (i = 0; i < 16; ++i)
     ;
 #pragma omp parallel
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp taskloop firstprivate(, )
   for (i = 0; i < 16; ++i)
     ;

diff --git a/test/OpenMP/taskloop_private_messages.cpp b/test/OpenMP/taskloop_private_messages.cpp
index 5b2311ee16c63b0c0fa4b59d2089c807d733b6d2..367d59da6959730d569aa6bed4017e74cb4e6868 100644 (file)
--- a/test/OpenMP/taskloop_private_messages.cpp
+++ b/test/OpenMP/taskloop_private_messages.cpp
@@ -108,7 +108,7 @@ int foomain(I argc, C **argv) {
 #pragma omp taskloop private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp taskloop private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp taskloop private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp taskloop private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
@@ -190,7 +190,7 @@ int main(int argc, char **argv) {
 #pragma omp taskloop private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp taskloop private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp taskloop private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp taskloop private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}

diff --git a/test/OpenMP/taskloop_simd_aligned_messages.cpp b/test/OpenMP/taskloop_simd_aligned_messages.cpp
index e1330a82b2b237a6edf897fc87d991b58ff20aad..b45f44fe1cf8bd710f0f47c098a10f77fe168e92 100644 (file)
--- a/test/OpenMP/taskloop_simd_aligned_messages.cpp
+++ b/test/OpenMP/taskloop_simd_aligned_messages.cpp
@@ -119,7 +119,7 @@ template<class I, class C> int foomain(I argc, C **argv) {
   for (I k = 0; k < argc; ++k) ++k;
   #pragma omp taskloop simd aligned (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (I k = 0; k < argc; ++k) ++k;
-  #pragma omp taskloop simd aligned (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp taskloop simd aligned (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (I k = 0; k < argc; ++k) ++k;
   #pragma omp taskloop simd aligned (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   for (I k = 0; k < argc; ++k) ++k;
@@ -177,7 +177,7 @@ int main(int argc, char **argv) {
   #pragma omp taskloop simd aligned (argv // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
   // expected-error@+1 {{argument of aligned clause should be array, pointer, reference to array or reference to pointer, not 'int'}}
-  #pragma omp taskloop simd aligned (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp taskloop simd aligned (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp taskloop simd aligned (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   for (int k = 0; k < argc; ++k) ++k;

diff --git a/test/OpenMP/taskloop_simd_firstprivate_messages.cpp b/test/OpenMP/taskloop_simd_firstprivate_messages.cpp
index a9f4013938c6c68ae8b043413bf19bfa79512c3f..83946695204b8b7e4a008df7cc7fa5558dc0595f 100644 (file)
--- a/test/OpenMP/taskloop_simd_firstprivate_messages.cpp
+++ b/test/OpenMP/taskloop_simd_firstprivate_messages.cpp
@@ -83,7 +83,7 @@ int foomain(int argc, char **argv) {
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel
-#pragma omp taskloop simd firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp taskloop simd firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel
@@ -189,7 +189,7 @@ int main(int argc, char **argv) {
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel
-#pragma omp taskloop simd firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp taskloop simd firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel

diff --git a/test/OpenMP/taskloop_simd_lastprivate_messages.cpp b/test/OpenMP/taskloop_simd_lastprivate_messages.cpp
index 5882465ef0e823d4e65d52660b26985aaedf87f5..ed1bdf5a6e3e49bdf466319b427233ffd518feab 100644 (file)
--- a/test/OpenMP/taskloop_simd_lastprivate_messages.cpp
+++ b/test/OpenMP/taskloop_simd_lastprivate_messages.cpp
@@ -85,7 +85,7 @@ int foomain(int argc, char **argv) {
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel
-#pragma omp taskloop simd lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp taskloop simd lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp parallel
@@ -179,7 +179,7 @@ int main(int argc, char **argv) {
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel
-#pragma omp taskloop simd lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp taskloop simd lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (i = 0; i < argc; ++i)
     foo();
 #pragma omp parallel

diff --git a/test/OpenMP/taskloop_simd_linear_messages.cpp b/test/OpenMP/taskloop_simd_linear_messages.cpp
index c27431865c9471ad5f3eff77c120f27ac44ca850..c9a82b9dc1488641af9e135b5622ea21035367f9 100644 (file)
--- a/test/OpenMP/taskloop_simd_linear_messages.cpp
+++ b/test/OpenMP/taskloop_simd_linear_messages.cpp
@@ -121,7 +121,7 @@ template<class I, class C> int foomain(I argc, C **argv) {
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp taskloop simd linear (val argc // expected-error {{use of undeclared identifier 'val'}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp taskloop simd linear (val(argc, // expected-error 2 {{expected ')'}} expected-note 2 {{to match this '('}}
+  #pragma omp taskloop simd linear (val(argc, // expected-error {{expected expression}} expected-error 2 {{expected ')'}} expected-note 2 {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp taskloop simd linear (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   for (int k = 0; k < argc; ++k) ++k;
@@ -210,7 +210,7 @@ int main(int argc, char **argv) {
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp taskloop simd linear (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
-  #pragma omp taskloop simd linear (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp taskloop simd linear (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k) ++k;
   #pragma omp taskloop simd linear (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
   for (int k = 0; k < argc; ++k) ++k;

diff --git a/test/OpenMP/taskloop_simd_misc_messages.c b/test/OpenMP/taskloop_simd_misc_messages.c
index 0a1050606ebd422b1825857abcc69e2dd531dac6..61c7b107d496d7a81e5593549b6f3be34e39c63c 100644 (file)
--- a/test/OpenMP/taskloop_simd_misc_messages.c
+++ b/test/OpenMP/taskloop_simd_misc_messages.c
@@ -205,12 +205,12 @@ void test_private() {
     ;
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp taskloop simd private(,
   for (i = 0; i < 16; ++i)
     ;
 #pragma omp parallel
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp taskloop simd private(, )
   for (i = 0; i < 16; ++i)
     ;
@@ -257,12 +257,12 @@ void test_lastprivate() {
 
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp taskloop simd lastprivate(,
   for (i = 0; i < 16; ++i)
     ;
 #pragma omp parallel
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp taskloop simd lastprivate(, )
   for (i = 0; i < 16; ++i)
     ;
@@ -308,12 +308,12 @@ void test_firstprivate() {
 
 #pragma omp parallel
 // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}}
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp taskloop simd firstprivate(,
   for (i = 0; i < 16; ++i)
     ;
 #pragma omp parallel
-// expected-error@+1 {{expected expression}}
+// expected-error@+1 2 {{expected expression}}
 #pragma omp taskloop simd firstprivate(, )
   for (i = 0; i < 16; ++i)
     ;

diff --git a/test/OpenMP/taskloop_simd_private_messages.cpp b/test/OpenMP/taskloop_simd_private_messages.cpp
index 2c2351ee8765fe3f758b35d44a6de42655664ee5..ba9e8da17e2054ddeac3a84fdb13edefda381132 100644 (file)
--- a/test/OpenMP/taskloop_simd_private_messages.cpp
+++ b/test/OpenMP/taskloop_simd_private_messages.cpp
@@ -108,7 +108,7 @@ int foomain(I argc, C **argv) {
 #pragma omp taskloop simd private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp taskloop simd private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp taskloop simd private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp taskloop simd private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
@@ -190,7 +190,7 @@ int main(int argc, char **argv) {
 #pragma omp taskloop simd private(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
-#pragma omp taskloop simd private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp taskloop simd private(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   for (int k = 0; k < argc; ++k)
     ++k;
 #pragma omp taskloop simd private(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}

diff --git a/test/OpenMP/teams_firstprivate_messages.cpp b/test/OpenMP/teams_firstprivate_messages.cpp
index 74a63002461e27060c1b71aebfd40b9bb9fb1a51..ba12fde86b5c2d7401d8f35d7952f9646d8924a9 100644 (file)
--- a/test/OpenMP/teams_firstprivate_messages.cpp
+++ b/test/OpenMP/teams_firstprivate_messages.cpp
@@ -77,7 +77,7 @@ int main(int argc, char **argv) {
 #pragma omp teams firstprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
 #pragma omp target
-#pragma omp teams firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp teams firstprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
 #pragma omp target
 #pragma omp teams firstprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}

diff --git a/test/OpenMP/teams_private_messages.cpp b/test/OpenMP/teams_private_messages.cpp
index b06fa0072f7fb42569e4e262bbc78ae7f7b0282e..344ef8daf996f42ddd559cadef145e6c834430d7 100644 (file)
--- a/test/OpenMP/teams_private_messages.cpp
+++ b/test/OpenMP/teams_private_messages.cpp
@@ -69,7 +69,7 @@ int main(int argc, char **argv) {
   #pragma omp teams private (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
   #pragma omp target
-  #pragma omp teams private (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp teams private (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
   #pragma omp target
   #pragma omp teams private (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}

diff --git a/test/OpenMP/teams_reduction_messages.cpp b/test/OpenMP/teams_reduction_messages.cpp
index 03ae6a5fd8f6b214bc941b627d1c671d3cc2fd4d..0420b010bb65b85a755a46e62e382f5483097f05 100644 (file)
--- a/test/OpenMP/teams_reduction_messages.cpp
+++ b/test/OpenMP/teams_reduction_messages.cpp
@@ -106,7 +106,7 @@ T tmain(T argc) {
 #pragma omp teams reduction(& : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
   foo();
 #pragma omp target
-#pragma omp teams reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
+#pragma omp teams reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}}
   foo();
 #pragma omp target
 #pragma omp teams reduction(|| : argc ? i : argc) // expected-error 2 {{expected variable name, array element or array section}}
@@ -236,7 +236,7 @@ int main(int argc, char **argv) {
 #pragma omp teams reduction(foo : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{incorrect reduction identifier, expected one of '+', '-', '*', '&', '|', '^', '&&', '||', 'min' or 'max'}}
   foo();
 #pragma omp target
-#pragma omp teams reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+#pragma omp teams reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
 #pragma omp target
 #pragma omp teams reduction(|| : argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name, array element or array section}}

diff --git a/test/OpenMP/teams_shared_messages.cpp b/test/OpenMP/teams_shared_messages.cpp
index 764b41bcf722c80b247d7ff48cec3846aa249246..e14ba1e32f47f7eec1df2898232664d54fa81862 100644 (file)
--- a/test/OpenMP/teams_shared_messages.cpp
+++ b/test/OpenMP/teams_shared_messages.cpp
@@ -72,7 +72,7 @@ int main(int argc, char **argv) {
   #pragma omp teams shared (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
   #pragma omp target
-  #pragma omp teams shared (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma omp teams shared (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
   foo();
   #pragma omp target
   #pragma omp teams shared (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}