From 05968174c3c99b075dda38ff860d4ca8c4e7990e Mon Sep 17 00:00:00 2001 From: Alexey Bataev Date: Thu, 31 Mar 2016 09:13:44 +0000 Subject: [PATCH] [OPENMP] Allow skip expression after comma in clauses with lists. Compatibility fix for better compatibility with the existing software. llvm-svn: 265003 --- clang/lib/Parse/ParseOpenMP.cpp | 9 +++++---- clang/test/OpenMP/distribute_firstprivate_messages.cpp | 2 +- clang/test/OpenMP/distribute_private_messages.cpp | 2 +- clang/test/OpenMP/flush_messages.cpp | 4 ++-- clang/test/OpenMP/for_ast_print.cpp | 2 +- clang/test/OpenMP/for_firstprivate_messages.cpp | 4 ++-- clang/test/OpenMP/for_lastprivate_messages.cpp | 4 ++-- clang/test/OpenMP/for_linear_messages.cpp | 4 ++-- clang/test/OpenMP/for_misc_messages.c | 12 ++++++------ clang/test/OpenMP/for_private_messages.cpp | 4 ++-- clang/test/OpenMP/for_reduction_messages.cpp | 4 ++-- clang/test/OpenMP/for_simd_aligned_messages.cpp | 4 ++-- clang/test/OpenMP/for_simd_firstprivate_messages.cpp | 4 ++-- clang/test/OpenMP/for_simd_lastprivate_messages.cpp | 4 ++-- clang/test/OpenMP/for_simd_linear_messages.cpp | 4 ++-- clang/test/OpenMP/for_simd_misc_messages.c | 16 ++++++---------- clang/test/OpenMP/for_simd_private_messages.cpp | 4 ++-- clang/test/OpenMP/for_simd_reduction_messages.cpp | 4 ++-- clang/test/OpenMP/parallel_copyin_messages.cpp | 2 +- clang/test/OpenMP/parallel_firstprivate_messages.cpp | 2 +- clang/test/OpenMP/parallel_for_copyin_messages.cpp | 2 +- clang/test/OpenMP/parallel_for_firstprivate_messages.cpp | 4 ++-- clang/test/OpenMP/parallel_for_lastprivate_messages.cpp | 4 ++-- clang/test/OpenMP/parallel_for_linear_messages.cpp | 4 ++-- clang/test/OpenMP/parallel_for_misc_messages.c | 12 ++++++------ clang/test/OpenMP/parallel_for_private_messages.cpp | 4 ++-- clang/test/OpenMP/parallel_for_reduction_messages.cpp | 4 ++-- clang/test/OpenMP/parallel_for_simd_aligned_messages.cpp | 4 ++-- clang/test/OpenMP/parallel_for_simd_copyin_messages.cpp | 2 +- .../OpenMP/parallel_for_simd_firstprivate_messages.cpp | 4 ++-- .../OpenMP/parallel_for_simd_lastprivate_messages.cpp | 4 ++-- clang/test/OpenMP/parallel_for_simd_linear_messages.cpp | 4 ++-- clang/test/OpenMP/parallel_for_simd_misc_messages.c | 16 ++++++---------- clang/test/OpenMP/parallel_for_simd_private_messages.cpp | 4 ++-- .../test/OpenMP/parallel_for_simd_reduction_messages.cpp | 4 ++-- clang/test/OpenMP/parallel_private_messages.cpp | 2 +- clang/test/OpenMP/parallel_reduction_messages.cpp | 4 ++-- clang/test/OpenMP/parallel_sections_copyin_messages.cpp | 2 +- .../OpenMP/parallel_sections_firstprivate_messages.cpp | 4 ++-- .../OpenMP/parallel_sections_lastprivate_messages.cpp | 4 ++-- clang/test/OpenMP/parallel_sections_misc_messages.c | 12 ++++++------ clang/test/OpenMP/parallel_sections_private_messages.cpp | 4 ++-- .../test/OpenMP/parallel_sections_reduction_messages.cpp | 4 ++-- clang/test/OpenMP/parallel_sections_shared_messages.cpp | 2 +- clang/test/OpenMP/parallel_shared_messages.cpp | 2 +- clang/test/OpenMP/sections_firstprivate_messages.cpp | 4 ++-- clang/test/OpenMP/sections_lastprivate_messages.cpp | 4 ++-- clang/test/OpenMP/sections_misc_messages.c | 12 ++++++------ clang/test/OpenMP/sections_private_messages.cpp | 4 ++-- clang/test/OpenMP/sections_reduction_messages.cpp | 4 ++-- clang/test/OpenMP/simd_aligned_messages.cpp | 4 ++-- clang/test/OpenMP/simd_lastprivate_messages.cpp | 4 ++-- clang/test/OpenMP/simd_linear_messages.cpp | 4 ++-- clang/test/OpenMP/simd_misc_messages.c | 12 ++++-------- clang/test/OpenMP/simd_private_messages.cpp | 4 ++-- clang/test/OpenMP/simd_reduction_messages.cpp | 4 ++-- clang/test/OpenMP/single_copyprivate_messages.cpp | 4 ++-- clang/test/OpenMP/single_firstprivate_messages.cpp | 4 ++-- clang/test/OpenMP/single_misc_messages.c | 8 ++++---- clang/test/OpenMP/single_private_messages.cpp | 4 ++-- clang/test/OpenMP/target_firstprivate_messages.cpp | 4 ++-- clang/test/OpenMP/target_map_messages.cpp | 4 ++-- .../OpenMP/target_parallel_firstprivate_messages.cpp | 2 +- .../OpenMP/target_parallel_for_firstprivate_messages.cpp | 4 ++-- .../OpenMP/target_parallel_for_lastprivate_messages.cpp | 4 ++-- .../test/OpenMP/target_parallel_for_linear_messages.cpp | 4 ++-- clang/test/OpenMP/target_parallel_for_map_messages.cpp | 4 ++-- clang/test/OpenMP/target_parallel_for_misc_messages.c | 12 ++++++------ .../test/OpenMP/target_parallel_for_private_messages.cpp | 4 ++-- .../OpenMP/target_parallel_for_reduction_messages.cpp | 4 ++-- clang/test/OpenMP/target_parallel_map_messages.cpp | 4 ++-- clang/test/OpenMP/target_parallel_private_messages.cpp | 4 ++-- clang/test/OpenMP/target_parallel_reduction_messages.cpp | 4 ++-- clang/test/OpenMP/target_parallel_shared_messages.cpp | 2 +- clang/test/OpenMP/target_private_messages.cpp | 4 ++-- clang/test/OpenMP/task_firstprivate_messages.cpp | 2 +- clang/test/OpenMP/task_private_messages.cpp | 2 +- clang/test/OpenMP/task_shared_messages.cpp | 2 +- clang/test/OpenMP/taskloop_firstprivate_messages.cpp | 4 ++-- clang/test/OpenMP/taskloop_lastprivate_messages.cpp | 4 ++-- clang/test/OpenMP/taskloop_misc_messages.c | 12 ++++++------ clang/test/OpenMP/taskloop_private_messages.cpp | 4 ++-- clang/test/OpenMP/taskloop_simd_aligned_messages.cpp | 4 ++-- .../test/OpenMP/taskloop_simd_firstprivate_messages.cpp | 4 ++-- clang/test/OpenMP/taskloop_simd_lastprivate_messages.cpp | 4 ++-- clang/test/OpenMP/taskloop_simd_linear_messages.cpp | 4 ++-- clang/test/OpenMP/taskloop_simd_misc_messages.c | 12 ++++++------ clang/test/OpenMP/taskloop_simd_private_messages.cpp | 4 ++-- clang/test/OpenMP/teams_firstprivate_messages.cpp | 2 +- clang/test/OpenMP/teams_private_messages.cpp | 2 +- clang/test/OpenMP/teams_reduction_messages.cpp | 4 ++-- clang/test/OpenMP/teams_shared_messages.cpp | 2 +- 92 files changed, 208 insertions(+), 219 deletions(-) diff --git a/clang/lib/Parse/ParseOpenMP.cpp b/clang/lib/Parse/ParseOpenMP.cpp index 96cf379..68e725c 100644 --- a/clang/lib/Parse/ParseOpenMP.cpp +++ b/clang/lib/Parse/ParseOpenMP.cpp @@ -1414,17 +1414,18 @@ 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(); - else if (Tok.isNot(tok::r_paren) && + IsComma = false; + } 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/clang/test/OpenMP/distribute_firstprivate_messages.cpp b/clang/test/OpenMP/distribute_firstprivate_messages.cpp index 5d371ab..6e614b4 100644 --- a/clang/test/OpenMP/distribute_firstprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #pragma omp distribute firstprivate (argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} for (i = 0; i < argc; ++i) foo(); #pragma omp target #pragma omp teams diff --git a/clang/test/OpenMP/distribute_private_messages.cpp b/clang/test/OpenMP/distribute_private_messages.cpp index 518b64d..c04c30a 100644 --- a/clang/test/OpenMP/distribute_private_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} for (int k = 0; k < argc; ++k) ++k; diff --git a/clang/test/OpenMP/flush_messages.cpp b/clang/test/OpenMP/flush_messages.cpp index 1c086a3..0960ce3 100644 --- a/clang/test/OpenMP/flush_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp flush(argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp flush(argc, // 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/clang/test/OpenMP/for_ast_print.cpp b/clang/test/OpenMP/for_ast_print.cpp index 182b395..552405a 100644 --- a/clang/test/OpenMP/for_ast_print.cpp +++ b/clang/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/clang/test/OpenMP/for_firstprivate_messages.cpp b/clang/test/OpenMP/for_firstprivate_messages.cpp index 60be4f5..50a37a5 100644 --- a/clang/test/OpenMP/for_firstprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp for firstprivate(argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp for firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} for (i = 0; i < argc; ++i) foo(); #pragma omp parallel diff --git a/clang/test/OpenMP/for_lastprivate_messages.cpp b/clang/test/OpenMP/for_lastprivate_messages.cpp index 79912b6..ba23dc4 100644 --- a/clang/test/OpenMP/for_lastprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp for lastprivate(argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp for lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} for (i = 0; i < argc; ++i) foo(); #pragma omp parallel diff --git a/clang/test/OpenMP/for_linear_messages.cpp b/clang/test/OpenMP/for_linear_messages.cpp index ab89349..be79d11 100644 --- a/clang/test/OpenMP/for_linear_messages.cpp +++ b/clang/test/OpenMP/for_linear_messages.cpp @@ -111,7 +111,7 @@ template 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} for (int k = 0; k < argc; ++k) ++k; diff --git a/clang/test/OpenMP/for_misc_messages.c b/clang/test/OpenMP/for_misc_messages.c index 0a7cdf8..77d57e610 100644 --- a/clang/test/OpenMP/for_misc_messages.c +++ b/clang/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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp for private(, for (i = 0; i < 16; ++i) ; #pragma omp parallel -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp for lastprivate(, for (i = 0; i < 16; ++i) ; #pragma omp parallel -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp for firstprivate(, for (i = 0; i < 16; ++i) ; #pragma omp parallel -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp for firstprivate(, ) for (i = 0; i < 16; ++i) ; diff --git a/clang/test/OpenMP/for_private_messages.cpp b/clang/test/OpenMP/for_private_messages.cpp index 4045c5b..604eab0 100644 --- a/clang/test/OpenMP/for_private_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} diff --git a/clang/test/OpenMP/for_reduction_messages.cpp b/clang/test/OpenMP/for_reduction_messages.cpp index 45a4681..d8c78a0 100644 --- a/clang/test/OpenMP/for_reduction_messages.cpp +++ b/clang/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 expression}} 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 ')'}} 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp for reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = 0; i < 10; ++i) foo(); #pragma omp parallel diff --git a/clang/test/OpenMP/for_simd_aligned_messages.cpp b/clang/test/OpenMP/for_simd_aligned_messages.cpp index cef83c3..b730da6 100644 --- a/clang/test/OpenMP/for_simd_aligned_messages.cpp +++ b/clang/test/OpenMP/for_simd_aligned_messages.cpp @@ -119,7 +119,7 @@ template 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #pragma omp for simd aligned (argc, // 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/clang/test/OpenMP/for_simd_firstprivate_messages.cpp b/clang/test/OpenMP/for_simd_firstprivate_messages.cpp index 4e96866..b8afb8e 100644 --- a/clang/test/OpenMP/for_simd_firstprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp for simd firstprivate(argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp for simd firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} for (i = 0; i < argc; ++i) foo(); #pragma omp parallel diff --git a/clang/test/OpenMP/for_simd_lastprivate_messages.cpp b/clang/test/OpenMP/for_simd_lastprivate_messages.cpp index d48c07d..c54799a 100644 --- a/clang/test/OpenMP/for_simd_lastprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp for simd lastprivate(argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp for simd lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} for (i = 0; i < argc; ++i) foo(); #pragma omp parallel diff --git a/clang/test/OpenMP/for_simd_linear_messages.cpp b/clang/test/OpenMP/for_simd_linear_messages.cpp index 3f93125..3ce4a07 100644 --- a/clang/test/OpenMP/for_simd_linear_messages.cpp +++ b/clang/test/OpenMP/for_simd_linear_messages.cpp @@ -111,7 +111,7 @@ template 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} for (int k = 0; k < argc; ++k) ++k; diff --git a/clang/test/OpenMP/for_simd_misc_messages.c b/clang/test/OpenMP/for_simd_misc_messages.c index ca1e366..ec5ee67 100644 --- a/clang/test/OpenMP/for_simd_misc_messages.c +++ b/clang/test/OpenMP/for_simd_misc_messages.c @@ -388,12 +388,10 @@ 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) @@ -493,12 +491,10 @@ 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) @@ -595,12 +591,12 @@ void test_private() { ; #pragma omp parallel // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp for simd private(, for (i = 0; i < 16; ++i) ; #pragma omp parallel -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp for simd private(, ) for (i = 0; i < 16; ++i) ; @@ -647,12 +643,12 @@ void test_lastprivate() { #pragma omp parallel // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp for simd lastprivate(, for (i = 0; i < 16; ++i) ; #pragma omp parallel -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp for simd lastprivate(, ) for (i = 0; i < 16; ++i) ; @@ -698,12 +694,12 @@ void test_firstprivate() { #pragma omp parallel // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp for simd firstprivate(, for (i = 0; i < 16; ++i) ; #pragma omp parallel -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp for simd firstprivate(, ) for (i = 0; i < 16; ++i) ; diff --git a/clang/test/OpenMP/for_simd_private_messages.cpp b/clang/test/OpenMP/for_simd_private_messages.cpp index ca4c3a3..a2fffba 100644 --- a/clang/test/OpenMP/for_simd_private_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} diff --git a/clang/test/OpenMP/for_simd_reduction_messages.cpp b/clang/test/OpenMP/for_simd_reduction_messages.cpp index 2935cec..479fe5c 100644 --- a/clang/test/OpenMP/for_simd_reduction_messages.cpp +++ b/clang/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 expression}} 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 ')'}} 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp for simd reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = 0; i < 10; ++i) foo(); #pragma omp parallel diff --git a/clang/test/OpenMP/parallel_copyin_messages.cpp b/clang/test/OpenMP/parallel_copyin_messages.cpp index 2b54b43..6be264c 100644 --- a/clang/test/OpenMP/parallel_copyin_messages.cpp +++ b/clang/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 expression}} 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 (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/clang/test/OpenMP/parallel_firstprivate_messages.cpp b/clang/test/OpenMP/parallel_firstprivate_messages.cpp index fc0eb4c..1e06548 100644 --- a/clang/test/OpenMP/parallel_firstprivate_messages.cpp +++ b/clang/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 expression}} 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 > 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/clang/test/OpenMP/parallel_for_copyin_messages.cpp b/clang/test/OpenMP/parallel_for_copyin_messages.cpp index 5a5d163..229b0fa 100644 --- a/clang/test/OpenMP/parallel_for_copyin_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp parallel for copyin(h, // 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/clang/test/OpenMP/parallel_for_firstprivate_messages.cpp b/clang/test/OpenMP/parallel_for_firstprivate_messages.cpp index c9a69da..b5b6d31 100644 --- a/clang/test/OpenMP/parallel_for_firstprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} diff --git a/clang/test/OpenMP/parallel_for_lastprivate_messages.cpp b/clang/test/OpenMP/parallel_for_lastprivate_messages.cpp index ccfe2ea..9a98c37 100644 --- a/clang/test/OpenMP/parallel_for_lastprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} diff --git a/clang/test/OpenMP/parallel_for_linear_messages.cpp b/clang/test/OpenMP/parallel_for_linear_messages.cpp index e5f5b61..e2e91bb 100644 --- a/clang/test/OpenMP/parallel_for_linear_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} diff --git a/clang/test/OpenMP/parallel_for_misc_messages.c b/clang/test/OpenMP/parallel_for_misc_messages.c index 1a773be..3f6e2e3 100644 --- a/clang/test/OpenMP/parallel_for_misc_messages.c +++ b/clang/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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp parallel for private(, for (i = 0; i < 16; ++i) ; -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp parallel for lastprivate(, for (i = 0; i < 16; ++i) ; -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp parallel for firstprivate(, for (i = 0; i < 16; ++i) ; -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp parallel for firstprivate(, ) for (i = 0; i < 16; ++i) ; diff --git a/clang/test/OpenMP/parallel_for_private_messages.cpp b/clang/test/OpenMP/parallel_for_private_messages.cpp index cc1b79f..0dc0a20 100644 --- a/clang/test/OpenMP/parallel_for_private_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} diff --git a/clang/test/OpenMP/parallel_for_reduction_messages.cpp b/clang/test/OpenMP/parallel_for_reduction_messages.cpp index 4d5a143..5ad8cda 100644 --- a/clang/test/OpenMP/parallel_for_reduction_messages.cpp +++ b/clang/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 expression}} 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 ')'}} 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp parallel for reduction(| : argc, // 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/clang/test/OpenMP/parallel_for_simd_aligned_messages.cpp b/clang/test/OpenMP/parallel_for_simd_aligned_messages.cpp index 2ccdf06..3849f60 100644 --- a/clang/test/OpenMP/parallel_for_simd_aligned_messages.cpp +++ b/clang/test/OpenMP/parallel_for_simd_aligned_messages.cpp @@ -119,7 +119,7 @@ template 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #pragma omp parallel for simd aligned (argc, // 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/clang/test/OpenMP/parallel_for_simd_copyin_messages.cpp b/clang/test/OpenMP/parallel_for_simd_copyin_messages.cpp index 1e6fdc9..a5e673b 100644 --- a/clang/test/OpenMP/parallel_for_simd_copyin_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp parallel for simd copyin(h, // 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/clang/test/OpenMP/parallel_for_simd_firstprivate_messages.cpp b/clang/test/OpenMP/parallel_for_simd_firstprivate_messages.cpp index 7a08572..6f22883 100644 --- a/clang/test/OpenMP/parallel_for_simd_firstprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} diff --git a/clang/test/OpenMP/parallel_for_simd_lastprivate_messages.cpp b/clang/test/OpenMP/parallel_for_simd_lastprivate_messages.cpp index bd1a6d5..b08b78f 100644 --- a/clang/test/OpenMP/parallel_for_simd_lastprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} diff --git a/clang/test/OpenMP/parallel_for_simd_linear_messages.cpp b/clang/test/OpenMP/parallel_for_simd_linear_messages.cpp index fc1895a..2027431 100644 --- a/clang/test/OpenMP/parallel_for_simd_linear_messages.cpp +++ b/clang/test/OpenMP/parallel_for_simd_linear_messages.cpp @@ -111,7 +111,7 @@ template 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} for (int k = 0; k < argc; ++k) ++k; diff --git a/clang/test/OpenMP/parallel_for_simd_misc_messages.c b/clang/test/OpenMP/parallel_for_simd_misc_messages.c index 378c48f..652a34b 100644 --- a/clang/test/OpenMP/parallel_for_simd_misc_messages.c +++ b/clang/test/OpenMP/parallel_for_simd_misc_messages.c @@ -386,12 +386,10 @@ 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) @@ -491,12 +489,10 @@ 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) @@ -593,12 +589,12 @@ void test_private() { ; #pragma omp parallel // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp parallel for simd private(, for (i = 0; i < 16; ++i) ; #pragma omp parallel -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp parallel for simd private(, ) for (i = 0; i < 16; ++i) ; @@ -645,12 +641,12 @@ void test_lastprivate() { #pragma omp parallel // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp parallel for simd lastprivate(, for (i = 0; i < 16; ++i) ; #pragma omp parallel -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp parallel for simd lastprivate(, ) for (i = 0; i < 16; ++i) ; @@ -696,12 +692,12 @@ void test_firstprivate() { #pragma omp parallel // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp parallel for simd firstprivate(, for (i = 0; i < 16; ++i) ; #pragma omp parallel -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp parallel for simd firstprivate(, ) for (i = 0; i < 16; ++i) ; diff --git a/clang/test/OpenMP/parallel_for_simd_private_messages.cpp b/clang/test/OpenMP/parallel_for_simd_private_messages.cpp index a33b35d..0b3df2d 100644 --- a/clang/test/OpenMP/parallel_for_simd_private_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} diff --git a/clang/test/OpenMP/parallel_for_simd_reduction_messages.cpp b/clang/test/OpenMP/parallel_for_simd_reduction_messages.cpp index afb0b36..3080e2a 100644 --- a/clang/test/OpenMP/parallel_for_simd_reduction_messages.cpp +++ b/clang/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 expression}} 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 ')'}} 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp parallel for simd reduction(| : argc, // 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/clang/test/OpenMP/parallel_private_messages.cpp b/clang/test/OpenMP/parallel_private_messages.cpp index ab535b4..43f092f 100644 --- a/clang/test/OpenMP/parallel_private_messages.cpp +++ b/clang/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 expression}} 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 > 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/clang/test/OpenMP/parallel_reduction_messages.cpp b/clang/test/OpenMP/parallel_reduction_messages.cpp index af1f5ed..8709256 100644 --- a/clang/test/OpenMP/parallel_reduction_messages.cpp +++ b/clang/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 expression}} 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 ')'}} 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp parallel reduction(| : argc, // 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/clang/test/OpenMP/parallel_sections_copyin_messages.cpp b/clang/test/OpenMP/parallel_sections_copyin_messages.cpp index 62b5d05..d8a34ba 100644 --- a/clang/test/OpenMP/parallel_sections_copyin_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp parallel sections copyin(h, // expected-error {{expected ')'}} expected-note {{to match this '('}} { foo(); } diff --git a/clang/test/OpenMP/parallel_sections_firstprivate_messages.cpp b/clang/test/OpenMP/parallel_sections_firstprivate_messages.cpp index b733aab..8327ea8 100644 --- a/clang/test/OpenMP/parallel_sections_firstprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp parallel sections firstprivate(argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp parallel sections firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} { foo(); } diff --git a/clang/test/OpenMP/parallel_sections_lastprivate_messages.cpp b/clang/test/OpenMP/parallel_sections_lastprivate_messages.cpp index af3c5e2..9fe467d 100644 --- a/clang/test/OpenMP/parallel_sections_lastprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp parallel sections lastprivate(argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp parallel sections lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} { foo(); } diff --git a/clang/test/OpenMP/parallel_sections_misc_messages.c b/clang/test/OpenMP/parallel_sections_misc_messages.c index 203d12c..a202187 100644 --- a/clang/test/OpenMP/parallel_sections_misc_messages.c +++ b/clang/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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp parallel sections private(, { foo(); } -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp parallel sections lastprivate(, { foo(); } -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp parallel sections firstprivate(, { foo(); } -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp parallel sections firstprivate(, ) { foo(); diff --git a/clang/test/OpenMP/parallel_sections_private_messages.cpp b/clang/test/OpenMP/parallel_sections_private_messages.cpp index 40b0138b..715dffe 100644 --- a/clang/test/OpenMP/parallel_sections_private_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp parallel sections private(argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp parallel sections private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} { foo(); } diff --git a/clang/test/OpenMP/parallel_sections_reduction_messages.cpp b/clang/test/OpenMP/parallel_sections_reduction_messages.cpp index 52d4cb9..8b72f99 100644 --- a/clang/test/OpenMP/parallel_sections_reduction_messages.cpp +++ b/clang/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 expression}} 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 ')'}} 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp parallel sections reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} { foo(); } diff --git a/clang/test/OpenMP/parallel_sections_shared_messages.cpp b/clang/test/OpenMP/parallel_sections_shared_messages.cpp index 2b83597..c027583 100644 --- a/clang/test/OpenMP/parallel_sections_shared_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp parallel sections shared(argc, // 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/clang/test/OpenMP/parallel_shared_messages.cpp b/clang/test/OpenMP/parallel_shared_messages.cpp index f6f4573..5a87ae7 100644 --- a/clang/test/OpenMP/parallel_shared_messages.cpp +++ b/clang/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 expression}} 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 > 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/clang/test/OpenMP/sections_firstprivate_messages.cpp b/clang/test/OpenMP/sections_firstprivate_messages.cpp index cd2b4b8..bd332dd 100644 --- a/clang/test/OpenMP/sections_firstprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp sections firstprivate(argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp sections firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} { foo(); } diff --git a/clang/test/OpenMP/sections_lastprivate_messages.cpp b/clang/test/OpenMP/sections_lastprivate_messages.cpp index 5f6b420..1bd4706 100644 --- a/clang/test/OpenMP/sections_lastprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp sections lastprivate(argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp sections lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} { foo(); } diff --git a/clang/test/OpenMP/sections_misc_messages.c b/clang/test/OpenMP/sections_misc_messages.c index da20aa1..5d18a9c 100644 --- a/clang/test/OpenMP/sections_misc_messages.c +++ b/clang/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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp sections private(, { foo(); } #pragma omp parallel -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp sections lastprivate(, { foo(); } #pragma omp parallel -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp sections firstprivate(, { foo(); } #pragma omp parallel -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp sections firstprivate(, ) { foo(); diff --git a/clang/test/OpenMP/sections_private_messages.cpp b/clang/test/OpenMP/sections_private_messages.cpp index 27bb313..2855a7d 100644 --- a/clang/test/OpenMP/sections_private_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp sections private(argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp sections private(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} { foo(); } diff --git a/clang/test/OpenMP/sections_reduction_messages.cpp b/clang/test/OpenMP/sections_reduction_messages.cpp index 134bf61..a050cee 100644 --- a/clang/test/OpenMP/sections_reduction_messages.cpp +++ b/clang/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 expression}} 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 ')'}} 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp sections reduction(| : argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} { foo(); } diff --git a/clang/test/OpenMP/simd_aligned_messages.cpp b/clang/test/OpenMP/simd_aligned_messages.cpp index 9515a0b..d1a8997 100644 --- a/clang/test/OpenMP/simd_aligned_messages.cpp +++ b/clang/test/OpenMP/simd_aligned_messages.cpp @@ -119,7 +119,7 @@ template 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #pragma omp simd aligned (argc, // 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/clang/test/OpenMP/simd_lastprivate_messages.cpp b/clang/test/OpenMP/simd_lastprivate_messages.cpp index 16223db..99a2fd0 100644 --- a/clang/test/OpenMP/simd_lastprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} diff --git a/clang/test/OpenMP/simd_linear_messages.cpp b/clang/test/OpenMP/simd_linear_messages.cpp index 792f78a..7b16983 100644 --- a/clang/test/OpenMP/simd_linear_messages.cpp +++ b/clang/test/OpenMP/simd_linear_messages.cpp @@ -121,7 +121,7 @@ template 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 {{expected expression}} expected-error 2 {{expected ')'}} expected-note 2 {{to match this '('}} + #pragma omp simd linear (val(argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} for (int k = 0; k < argc; ++k) ++k; diff --git a/clang/test/OpenMP/simd_misc_messages.c b/clang/test/OpenMP/simd_misc_messages.c index 1e15482..1d6a0d9 100644 --- a/clang/test/OpenMP/simd_misc_messages.c +++ b/clang/test/OpenMP/simd_misc_messages.c @@ -376,12 +376,10 @@ 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) @@ -480,12 +478,10 @@ 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) @@ -579,11 +575,11 @@ void test_private() { for (i = 0; i < 16; ++i) ; // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp simd private(, for (i = 0; i < 16; ++i) ; -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp simd private(, ) for (i = 0; i < 16; ++i) ; @@ -632,11 +628,11 @@ void test_lastprivate() { ; // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp simd lastprivate(, for (i = 0; i < 16; ++i) ; -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp simd lastprivate(, ) for (i = 0; i < 16; ++i) ; diff --git a/clang/test/OpenMP/simd_private_messages.cpp b/clang/test/OpenMP/simd_private_messages.cpp index 1850101..de2c34f 100644 --- a/clang/test/OpenMP/simd_private_messages.cpp +++ b/clang/test/OpenMP/simd_private_messages.cpp @@ -99,7 +99,7 @@ template 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} for (int k = 0; k < argc; ++k) ++k; diff --git a/clang/test/OpenMP/simd_reduction_messages.cpp b/clang/test/OpenMP/simd_reduction_messages.cpp index c47d53e..ee832fd 100644 --- a/clang/test/OpenMP/simd_reduction_messages.cpp +++ b/clang/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 expression}} 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 ')'}} 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp simd reduction(| : argc, // 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/clang/test/OpenMP/single_copyprivate_messages.cpp b/clang/test/OpenMP/single_copyprivate_messages.cpp index 4714753..86188fe 100644 --- a/clang/test/OpenMP/single_copyprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp single copyprivate(h, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp single copyprivate(h, // 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/clang/test/OpenMP/single_firstprivate_messages.cpp b/clang/test/OpenMP/single_firstprivate_messages.cpp index 32de9fd..4e79945 100644 --- a/clang/test/OpenMP/single_firstprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp single firstprivate(argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp single firstprivate(argc, // 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/clang/test/OpenMP/single_misc_messages.c b/clang/test/OpenMP/single_misc_messages.c index 2c922dd..feec869 100644 --- a/clang/test/OpenMP/single_misc_messages.c +++ b/clang/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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp single private(, foo(); #pragma omp parallel -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp single firstprivate(, foo(); #pragma omp parallel -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp single firstprivate(, ) foo(); #pragma omp parallel diff --git a/clang/test/OpenMP/single_private_messages.cpp b/clang/test/OpenMP/single_private_messages.cpp index 0ed0e6c..1a2ba3f 100644 --- a/clang/test/OpenMP/single_private_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp single private(argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp single private(argc, // 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/clang/test/OpenMP/target_firstprivate_messages.cpp b/clang/test/OpenMP/target_firstprivate_messages.cpp index 6dbad67..f26ea62 100644 --- a/clang/test/OpenMP/target_firstprivate_messages.cpp +++ b/clang/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 expression}} 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 > 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 expression}} 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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} {} diff --git a/clang/test/OpenMP/target_map_messages.cpp b/clang/test/OpenMP/target_map_messages.cpp index baa0751..9ac299a 100644 --- a/clang/test/OpenMP/target_map_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp target map(from: argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp target data map(from: argc, // 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/clang/test/OpenMP/target_parallel_firstprivate_messages.cpp b/clang/test/OpenMP/target_parallel_firstprivate_messages.cpp index dd6825a..15d60b2 100644 --- a/clang/test/OpenMP/target_parallel_firstprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #pragma omp target parallel firstprivate (argc, // 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/clang/test/OpenMP/target_parallel_for_firstprivate_messages.cpp b/clang/test/OpenMP/target_parallel_for_firstprivate_messages.cpp index 36bfe25..103023c 100644 --- a/clang/test/OpenMP/target_parallel_for_firstprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} diff --git a/clang/test/OpenMP/target_parallel_for_lastprivate_messages.cpp b/clang/test/OpenMP/target_parallel_for_lastprivate_messages.cpp index c001b7f..dff72c1 100644 --- a/clang/test/OpenMP/target_parallel_for_lastprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} diff --git a/clang/test/OpenMP/target_parallel_for_linear_messages.cpp b/clang/test/OpenMP/target_parallel_for_linear_messages.cpp index 36e897d..ea82ede 100644 --- a/clang/test/OpenMP/target_parallel_for_linear_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} diff --git a/clang/test/OpenMP/target_parallel_for_map_messages.cpp b/clang/test/OpenMP/target_parallel_for_map_messages.cpp index 60f2b80..f17fbdc 100644 --- a/clang/test/OpenMP/target_parallel_for_map_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp target parallel for map(from: argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp target parallel for map(from: argc, // 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/clang/test/OpenMP/target_parallel_for_misc_messages.c b/clang/test/OpenMP/target_parallel_for_misc_messages.c index cfe83f1..2378aae 100644 --- a/clang/test/OpenMP/target_parallel_for_misc_messages.c +++ b/clang/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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp target parallel for private(, for (i = 0; i < 16; ++i) ; -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp target parallel for lastprivate(, for (i = 0; i < 16; ++i) ; -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp target parallel for firstprivate(, for (i = 0; i < 16; ++i) ; -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp target parallel for firstprivate(, ) for (i = 0; i < 16; ++i) ; diff --git a/clang/test/OpenMP/target_parallel_for_private_messages.cpp b/clang/test/OpenMP/target_parallel_for_private_messages.cpp index 1d6381a..9f2439a 100644 --- a/clang/test/OpenMP/target_parallel_for_private_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} diff --git a/clang/test/OpenMP/target_parallel_for_reduction_messages.cpp b/clang/test/OpenMP/target_parallel_for_reduction_messages.cpp index 16697a9..9a86f2a 100644 --- a/clang/test/OpenMP/target_parallel_for_reduction_messages.cpp +++ b/clang/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 expression}} 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 ')'}} 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp target parallel for reduction(| : argc, // 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/clang/test/OpenMP/target_parallel_map_messages.cpp b/clang/test/OpenMP/target_parallel_map_messages.cpp index 9d1be5c..414a471 100644 --- a/clang/test/OpenMP/target_parallel_map_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp target parallel map(from: argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp target parallel map(from: argc, // 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/clang/test/OpenMP/target_parallel_private_messages.cpp b/clang/test/OpenMP/target_parallel_private_messages.cpp index fabd37d..77507bc 100644 --- a/clang/test/OpenMP/target_parallel_private_messages.cpp +++ b/clang/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 expression}} 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 > 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 expression}} 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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} {} diff --git a/clang/test/OpenMP/target_parallel_reduction_messages.cpp b/clang/test/OpenMP/target_parallel_reduction_messages.cpp index c9434e7..3f7eef0 100644 --- a/clang/test/OpenMP/target_parallel_reduction_messages.cpp +++ b/clang/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 expression}} 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 ')'}} 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp target parallel reduction(| : argc, // 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/clang/test/OpenMP/target_parallel_shared_messages.cpp b/clang/test/OpenMP/target_parallel_shared_messages.cpp index 302a092..4ef4707 100644 --- a/clang/test/OpenMP/target_parallel_shared_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #pragma omp target parallel shared (argc, // 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/clang/test/OpenMP/target_private_messages.cpp b/clang/test/OpenMP/target_private_messages.cpp index a093a87..7a5c43d 100644 --- a/clang/test/OpenMP/target_private_messages.cpp +++ b/clang/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 expression}} 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 > 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 expression}} 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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} {} diff --git a/clang/test/OpenMP/task_firstprivate_messages.cpp b/clang/test/OpenMP/task_firstprivate_messages.cpp index ef5f385..4f02ce1 100644 --- a/clang/test/OpenMP/task_firstprivate_messages.cpp +++ b/clang/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 expression}} 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 > 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/clang/test/OpenMP/task_private_messages.cpp b/clang/test/OpenMP/task_private_messages.cpp index 6bce135..10865ca 100644 --- a/clang/test/OpenMP/task_private_messages.cpp +++ b/clang/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 expression}} 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 > 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/clang/test/OpenMP/task_shared_messages.cpp b/clang/test/OpenMP/task_shared_messages.cpp index bf3b8ba..dedf462 100644 --- a/clang/test/OpenMP/task_shared_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp task shared(argc, // 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/clang/test/OpenMP/taskloop_firstprivate_messages.cpp b/clang/test/OpenMP/taskloop_firstprivate_messages.cpp index e2e87e4..a784bcb 100644 --- a/clang/test/OpenMP/taskloop_firstprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp taskloop firstprivate(argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp taskloop firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} for (i = 0; i < argc; ++i) foo(); #pragma omp parallel diff --git a/clang/test/OpenMP/taskloop_lastprivate_messages.cpp b/clang/test/OpenMP/taskloop_lastprivate_messages.cpp index e436444..b0c9940 100644 --- a/clang/test/OpenMP/taskloop_lastprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp taskloop lastprivate(argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp taskloop lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} for (i = 0; i < argc; ++i) foo(); #pragma omp parallel diff --git a/clang/test/OpenMP/taskloop_misc_messages.c b/clang/test/OpenMP/taskloop_misc_messages.c index f9e084e..21366e6 100644 --- a/clang/test/OpenMP/taskloop_misc_messages.c +++ b/clang/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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp taskloop private(, for (i = 0; i < 16; ++i) ; #pragma omp parallel -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp taskloop lastprivate(, for (i = 0; i < 16; ++i) ; #pragma omp parallel -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp taskloop firstprivate(, for (i = 0; i < 16; ++i) ; #pragma omp parallel -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp taskloop firstprivate(, ) for (i = 0; i < 16; ++i) ; diff --git a/clang/test/OpenMP/taskloop_private_messages.cpp b/clang/test/OpenMP/taskloop_private_messages.cpp index 367d59d..5b2311e 100644 --- a/clang/test/OpenMP/taskloop_private_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} diff --git a/clang/test/OpenMP/taskloop_simd_aligned_messages.cpp b/clang/test/OpenMP/taskloop_simd_aligned_messages.cpp index b45f44f..e1330a8 100644 --- a/clang/test/OpenMP/taskloop_simd_aligned_messages.cpp +++ b/clang/test/OpenMP/taskloop_simd_aligned_messages.cpp @@ -119,7 +119,7 @@ template 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #pragma omp taskloop simd aligned (argc, // 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/clang/test/OpenMP/taskloop_simd_firstprivate_messages.cpp b/clang/test/OpenMP/taskloop_simd_firstprivate_messages.cpp index 8394669..a9f4013 100644 --- a/clang/test/OpenMP/taskloop_simd_firstprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp taskloop simd firstprivate(argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp taskloop simd firstprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} for (i = 0; i < argc; ++i) foo(); #pragma omp parallel diff --git a/clang/test/OpenMP/taskloop_simd_lastprivate_messages.cpp b/clang/test/OpenMP/taskloop_simd_lastprivate_messages.cpp index ed1bdf5..5882465 100644 --- a/clang/test/OpenMP/taskloop_simd_lastprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp taskloop simd lastprivate(argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp taskloop simd lastprivate(argc, // expected-error {{expected ')'}} expected-note {{to match this '('}} for (i = 0; i < argc; ++i) foo(); #pragma omp parallel diff --git a/clang/test/OpenMP/taskloop_simd_linear_messages.cpp b/clang/test/OpenMP/taskloop_simd_linear_messages.cpp index c9a82b9..c274318 100644 --- a/clang/test/OpenMP/taskloop_simd_linear_messages.cpp +++ b/clang/test/OpenMP/taskloop_simd_linear_messages.cpp @@ -121,7 +121,7 @@ template 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 {{expected expression}} expected-error 2 {{expected ')'}} expected-note 2 {{to match this '('}} + #pragma omp taskloop simd linear (val(argc, // 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} for (int k = 0; k < argc; ++k) ++k; diff --git a/clang/test/OpenMP/taskloop_simd_misc_messages.c b/clang/test/OpenMP/taskloop_simd_misc_messages.c index 61c7b10..0a10506 100644 --- a/clang/test/OpenMP/taskloop_simd_misc_messages.c +++ b/clang/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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp taskloop simd private(, for (i = 0; i < 16; ++i) ; #pragma omp parallel -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp taskloop simd lastprivate(, for (i = 0; i < 16; ++i) ; #pragma omp parallel -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{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 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp taskloop simd firstprivate(, for (i = 0; i < 16; ++i) ; #pragma omp parallel -// expected-error@+1 2 {{expected expression}} +// expected-error@+1 {{expected expression}} #pragma omp taskloop simd firstprivate(, ) for (i = 0; i < 16; ++i) ; diff --git a/clang/test/OpenMP/taskloop_simd_private_messages.cpp b/clang/test/OpenMP/taskloop_simd_private_messages.cpp index ba9e8da..2c2351e 100644 --- a/clang/test/OpenMP/taskloop_simd_private_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#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 > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} diff --git a/clang/test/OpenMP/teams_firstprivate_messages.cpp b/clang/test/OpenMP/teams_firstprivate_messages.cpp index ba12fde..74a630024 100644 --- a/clang/test/OpenMP/teams_firstprivate_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp teams firstprivate(argc, // 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/clang/test/OpenMP/teams_private_messages.cpp b/clang/test/OpenMP/teams_private_messages.cpp index 344ef8d..b06fa00 100644 --- a/clang/test/OpenMP/teams_private_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #pragma omp teams private (argc, // 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/clang/test/OpenMP/teams_reduction_messages.cpp b/clang/test/OpenMP/teams_reduction_messages.cpp index 0420b01..03ae6a5 100644 --- a/clang/test/OpenMP/teams_reduction_messages.cpp +++ b/clang/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 expression}} 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 ')'}} 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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} +#pragma omp teams reduction(| : argc, // 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/clang/test/OpenMP/teams_shared_messages.cpp b/clang/test/OpenMP/teams_shared_messages.cpp index e14ba1e..764b41b 100644 --- a/clang/test/OpenMP/teams_shared_messages.cpp +++ b/clang/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 expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + #pragma omp teams shared (argc, // 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}} -- 2.7.4