r265003 - [OPENMP] Allow skip expression after comma in clauses with lists.

Richard Smith via cfe-commits cfe-commits at lists.llvm.org
Thu Mar 31 09:17:11 PDT 2016


If this is not allowed by the OpenMP specification, please produce an
ExtWarn or Extension diagnostic when accepting it.
On 31 Mar 2016 2:19 a.m., "Alexey Bataev via cfe-commits" <
cfe-commits at lists.llvm.org> wrote:

> Author: abataev
> Date: Thu Mar 31 04:13:44 2016
> New Revision: 265003
>
> URL: http://llvm.org/viewvc/llvm-project?rev=265003&view=rev
> Log:
> [OPENMP] Allow skip expression after comma in clauses with lists.
>
> Compatibility fix for better compatibility with the existing software.
>
> Modified:
>     cfe/trunk/lib/Parse/ParseOpenMP.cpp
>     cfe/trunk/test/OpenMP/distribute_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/distribute_private_messages.cpp
>     cfe/trunk/test/OpenMP/flush_messages.cpp
>     cfe/trunk/test/OpenMP/for_ast_print.cpp
>     cfe/trunk/test/OpenMP/for_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/for_lastprivate_messages.cpp
>     cfe/trunk/test/OpenMP/for_linear_messages.cpp
>     cfe/trunk/test/OpenMP/for_misc_messages.c
>     cfe/trunk/test/OpenMP/for_private_messages.cpp
>     cfe/trunk/test/OpenMP/for_reduction_messages.cpp
>     cfe/trunk/test/OpenMP/for_simd_aligned_messages.cpp
>     cfe/trunk/test/OpenMP/for_simd_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/for_simd_lastprivate_messages.cpp
>     cfe/trunk/test/OpenMP/for_simd_linear_messages.cpp
>     cfe/trunk/test/OpenMP/for_simd_misc_messages.c
>     cfe/trunk/test/OpenMP/for_simd_private_messages.cpp
>     cfe/trunk/test/OpenMP/for_simd_reduction_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_copyin_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_copyin_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_lastprivate_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_linear_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_misc_messages.c
>     cfe/trunk/test/OpenMP/parallel_for_private_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_reduction_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_aligned_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_copyin_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_lastprivate_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_linear_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_misc_messages.c
>     cfe/trunk/test/OpenMP/parallel_for_simd_private_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_reduction_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_private_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_reduction_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_sections_copyin_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_sections_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_sections_lastprivate_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_sections_misc_messages.c
>     cfe/trunk/test/OpenMP/parallel_sections_private_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_sections_reduction_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_sections_shared_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_shared_messages.cpp
>     cfe/trunk/test/OpenMP/sections_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/sections_lastprivate_messages.cpp
>     cfe/trunk/test/OpenMP/sections_misc_messages.c
>     cfe/trunk/test/OpenMP/sections_private_messages.cpp
>     cfe/trunk/test/OpenMP/sections_reduction_messages.cpp
>     cfe/trunk/test/OpenMP/simd_aligned_messages.cpp
>     cfe/trunk/test/OpenMP/simd_lastprivate_messages.cpp
>     cfe/trunk/test/OpenMP/simd_linear_messages.cpp
>     cfe/trunk/test/OpenMP/simd_misc_messages.c
>     cfe/trunk/test/OpenMP/simd_private_messages.cpp
>     cfe/trunk/test/OpenMP/simd_reduction_messages.cpp
>     cfe/trunk/test/OpenMP/single_copyprivate_messages.cpp
>     cfe/trunk/test/OpenMP/single_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/single_misc_messages.c
>     cfe/trunk/test/OpenMP/single_private_messages.cpp
>     cfe/trunk/test/OpenMP/target_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/target_map_messages.cpp
>     cfe/trunk/test/OpenMP/target_parallel_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/target_parallel_for_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/target_parallel_for_lastprivate_messages.cpp
>     cfe/trunk/test/OpenMP/target_parallel_for_linear_messages.cpp
>     cfe/trunk/test/OpenMP/target_parallel_for_map_messages.cpp
>     cfe/trunk/test/OpenMP/target_parallel_for_misc_messages.c
>     cfe/trunk/test/OpenMP/target_parallel_for_private_messages.cpp
>     cfe/trunk/test/OpenMP/target_parallel_for_reduction_messages.cpp
>     cfe/trunk/test/OpenMP/target_parallel_map_messages.cpp
>     cfe/trunk/test/OpenMP/target_parallel_private_messages.cpp
>     cfe/trunk/test/OpenMP/target_parallel_reduction_messages.cpp
>     cfe/trunk/test/OpenMP/target_parallel_shared_messages.cpp
>     cfe/trunk/test/OpenMP/target_private_messages.cpp
>     cfe/trunk/test/OpenMP/task_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/task_private_messages.cpp
>     cfe/trunk/test/OpenMP/task_shared_messages.cpp
>     cfe/trunk/test/OpenMP/taskloop_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/taskloop_lastprivate_messages.cpp
>     cfe/trunk/test/OpenMP/taskloop_misc_messages.c
>     cfe/trunk/test/OpenMP/taskloop_private_messages.cpp
>     cfe/trunk/test/OpenMP/taskloop_simd_aligned_messages.cpp
>     cfe/trunk/test/OpenMP/taskloop_simd_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/taskloop_simd_lastprivate_messages.cpp
>     cfe/trunk/test/OpenMP/taskloop_simd_linear_messages.cpp
>     cfe/trunk/test/OpenMP/taskloop_simd_misc_messages.c
>     cfe/trunk/test/OpenMP/taskloop_simd_private_messages.cpp
>     cfe/trunk/test/OpenMP/teams_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/teams_private_messages.cpp
>     cfe/trunk/test/OpenMP/teams_reduction_messages.cpp
>     cfe/trunk/test/OpenMP/teams_shared_messages.cpp
>
> Modified: cfe/trunk/lib/Parse/ParseOpenMP.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseOpenMP.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/lib/Parse/ParseOpenMP.cpp (original)
> +++ cfe/trunk/lib/Parse/ParseOpenMP.cpp Thu Mar 31 04:13:44 2016
> @@ -1414,17 +1414,18 @@ OMPClause *Parser::ParseOpenMPVarListCla
>      // 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)
>
> Modified: cfe/trunk/test/OpenMP/distribute_firstprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/distribute_firstprivate_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/distribute_firstprivate_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/distribute_firstprivate_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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
>
> Modified: cfe/trunk/test/OpenMP/distribute_private_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/distribute_private_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/distribute_private_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/distribute_private_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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;
>
> Modified: cfe/trunk/test/OpenMP/flush_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/flush_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/flush_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/flush_messages.cpp Thu Mar 31 04:13:44 2016
> @@ -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}}
>
> Modified: cfe/trunk/test/OpenMP/for_ast_print.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_ast_print.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_ast_print.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_ast_print.cpp Thu Mar 31 04:13:44 2016
> @@ -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();
>
> Modified: cfe/trunk/test/OpenMP/for_firstprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_firstprivate_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_firstprivate_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_firstprivate_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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
>
> Modified: cfe/trunk/test/OpenMP/for_lastprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_lastprivate_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_lastprivate_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_lastprivate_messages.cpp Thu Mar 31 04:13:44
> 2016
> @@ -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
>
> Modified: cfe/trunk/test/OpenMP/for_linear_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_linear_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_linear_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_linear_messages.cpp Thu Mar 31 04:13:44 2016
> @@ -111,7 +111,7 @@ template<class I, class C> int foomain(I
>    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;
>
> Modified: cfe/trunk/test/OpenMP/for_misc_messages.c
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_misc_messages.c?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_misc_messages.c (original)
> +++ cfe/trunk/test/OpenMP/for_misc_messages.c Thu Mar 31 04:13:44 2016
> @@ -211,12 +211,12 @@ void test_private() {
>      ;
>  #pragma omp parallel
>  // expected-error at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp for private(,
>    for (i = 0; i < 16; ++i)
>      ;
>  #pragma omp parallel
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +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 at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp for lastprivate(,
>    for (i = 0; i < 16; ++i)
>      ;
>  #pragma omp parallel
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +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 at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp for firstprivate(,
>    for (i = 0; i < 16; ++i)
>      ;
>  #pragma omp parallel
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp for firstprivate(, )
>    for (i = 0; i < 16; ++i)
>      ;
>
> Modified: cfe/trunk/test/OpenMP/for_private_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_private_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_private_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_private_messages.cpp Thu Mar 31 04:13:44 2016
> @@ -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}}
>
> Modified: cfe/trunk/test/OpenMP/for_reduction_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_reduction_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_reduction_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_reduction_messages.cpp Thu Mar 31 04:13:44
> 2016
> @@ -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
>
> Modified: cfe/trunk/test/OpenMP/for_simd_aligned_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_simd_aligned_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_simd_aligned_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_simd_aligned_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -119,7 +119,7 @@ template<class I, class C> int foomain(I
>    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 at +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;
>
> Modified: cfe/trunk/test/OpenMP/for_simd_firstprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_simd_firstprivate_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_simd_firstprivate_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_simd_firstprivate_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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
>
> Modified: cfe/trunk/test/OpenMP/for_simd_lastprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_simd_lastprivate_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_simd_lastprivate_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_simd_lastprivate_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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
>
> Modified: cfe/trunk/test/OpenMP/for_simd_linear_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_simd_linear_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_simd_linear_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_simd_linear_messages.cpp Thu Mar 31 04:13:44
> 2016
> @@ -111,7 +111,7 @@ template<class I, class C> int foomain(I
>    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;
>
> Modified: cfe/trunk/test/OpenMP/for_simd_misc_messages.c
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_simd_misc_messages.c?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_simd_misc_messages.c (original)
> +++ cfe/trunk/test/OpenMP/for_simd_misc_messages.c Thu Mar 31 04:13:44 2016
> @@ -388,12 +388,10 @@ void test_linear() {
>  #pragma omp for simd linear(
>    for (i = 0; i < 16; ++i)
>      ;
> -// expected-error at +2 {{expected expression}}
>  // expected-error at +1 {{expected expression}} expected-error at +1
> {{expected ')'}} expected-note at +1 {{to match this '('}}
>  #pragma omp for simd linear(,
>    for (i = 0; i < 16; ++i)
>      ;
> -// expected-error at +2 {{expected expression}}
>  // expected-error at +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 at +2 {{expected expression}}
>  // expected-error at +1 {{expected expression}} expected-error at +1
> {{expected ')'}} expected-note at +1 {{to match this '('}}
>  #pragma omp for simd aligned(,
>    for (i = 0; i < 16; ++i)
>      ;
> -// expected-error at +2 {{expected expression}}
>  // expected-error at +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 at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp for simd private(,
>    for (i = 0; i < 16; ++i)
>      ;
>  #pragma omp parallel
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +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 at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp for simd lastprivate(,
>    for (i = 0; i < 16; ++i)
>      ;
>  #pragma omp parallel
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +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 at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp for simd firstprivate(,
>    for (i = 0; i < 16; ++i)
>      ;
>  #pragma omp parallel
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp for simd firstprivate(, )
>    for (i = 0; i < 16; ++i)
>      ;
>
> Modified: cfe/trunk/test/OpenMP/for_simd_private_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_simd_private_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_simd_private_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_simd_private_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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}}
>
> Modified: cfe/trunk/test/OpenMP/for_simd_reduction_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_simd_reduction_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_simd_reduction_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_simd_reduction_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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
>
> Modified: cfe/trunk/test/OpenMP/parallel_copyin_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_copyin_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_copyin_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_copyin_messages.cpp Thu Mar 31 04:13:44
> 2016
> @@ -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}}
>
> Modified: cfe/trunk/test/OpenMP/parallel_firstprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_firstprivate_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_firstprivate_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_firstprivate_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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}}
>
> Modified: cfe/trunk/test/OpenMP/parallel_for_copyin_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_copyin_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_for_copyin_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_for_copyin_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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}}
>
> Modified: cfe/trunk/test/OpenMP/parallel_for_firstprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_firstprivate_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_for_firstprivate_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_for_firstprivate_messages.cpp Thu Mar
> 31 04:13:44 2016
> @@ -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}}
>
> Modified: cfe/trunk/test/OpenMP/parallel_for_lastprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_lastprivate_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_for_lastprivate_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_for_lastprivate_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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}}
>
> Modified: cfe/trunk/test/OpenMP/parallel_for_linear_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_linear_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_for_linear_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_for_linear_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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}}
>
> Modified: cfe/trunk/test/OpenMP/parallel_for_misc_messages.c
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_misc_messages.c?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_for_misc_messages.c (original)
> +++ cfe/trunk/test/OpenMP/parallel_for_misc_messages.c Thu Mar 31 04:13:44
> 2016
> @@ -180,11 +180,11 @@ void test_private() {
>    for (i = 0; i < 16; ++i)
>      ;
>  // expected-error at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp parallel for private(,
>    for (i = 0; i < 16; ++i)
>      ;
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp parallel for private(, )
>    for (i = 0; i < 16; ++i)
>      ;
> @@ -223,11 +223,11 @@ void test_lastprivate() {
>      ;
>
>  // expected-error at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp parallel for lastprivate(,
>    for (i = 0; i < 16; ++i)
>      ;
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp parallel for lastprivate(, )
>    for (i = 0; i < 16; ++i)
>      ;
> @@ -265,11 +265,11 @@ void test_firstprivate() {
>      ;
>
>  // expected-error at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp parallel for firstprivate(,
>    for (i = 0; i < 16; ++i)
>      ;
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp parallel for firstprivate(, )
>    for (i = 0; i < 16; ++i)
>      ;
>
> Modified: cfe/trunk/test/OpenMP/parallel_for_private_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_private_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_for_private_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_for_private_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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}}
>
> Modified: cfe/trunk/test/OpenMP/parallel_for_reduction_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_reduction_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_for_reduction_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_for_reduction_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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}}
>
> Modified: cfe/trunk/test/OpenMP/parallel_for_simd_aligned_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_simd_aligned_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_for_simd_aligned_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_for_simd_aligned_messages.cpp Thu Mar
> 31 04:13:44 2016
> @@ -119,7 +119,7 @@ template<class I, class C> int foomain(I
>    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 at +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;
>
> Modified: cfe/trunk/test/OpenMP/parallel_for_simd_copyin_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_simd_copyin_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_for_simd_copyin_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_for_simd_copyin_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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}}
>
> Modified: cfe/trunk/test/OpenMP/parallel_for_simd_firstprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_simd_firstprivate_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_for_simd_firstprivate_messages.cpp
> (original)
> +++ cfe/trunk/test/OpenMP/parallel_for_simd_firstprivate_messages.cpp Thu
> Mar 31 04:13:44 2016
> @@ -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}}
>
> Modified: cfe/trunk/test/OpenMP/parallel_for_simd_lastprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_simd_lastprivate_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_for_simd_lastprivate_messages.cpp
> (original)
> +++ cfe/trunk/test/OpenMP/parallel_for_simd_lastprivate_messages.cpp Thu
> Mar 31 04:13:44 2016
> @@ -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}}
>
> Modified: cfe/trunk/test/OpenMP/parallel_for_simd_linear_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_simd_linear_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_for_simd_linear_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_for_simd_linear_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -111,7 +111,7 @@ template<class I, class C> int foomain(I
>    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;
>
> Modified: cfe/trunk/test/OpenMP/parallel_for_simd_misc_messages.c
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_simd_misc_messages.c?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_for_simd_misc_messages.c (original)
> +++ cfe/trunk/test/OpenMP/parallel_for_simd_misc_messages.c Thu Mar 31
> 04:13:44 2016
> @@ -386,12 +386,10 @@ void test_linear() {
>  #pragma omp parallel for simd linear(
>    for (i = 0; i < 16; ++i)
>      ;
> -// expected-error at +2 {{expected expression}}
>  // expected-error at +1 {{expected expression}} expected-error at +1
> {{expected ')'}} expected-note at +1 {{to match this '('}}
>  #pragma omp parallel for simd linear(,
>    for (i = 0; i < 16; ++i)
>      ;
> -// expected-error at +2 {{expected expression}}
>  // expected-error at +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 at +2 {{expected expression}}
>  // expected-error at +1 {{expected expression}} expected-error at +1
> {{expected ')'}} expected-note at +1 {{to match this '('}}
>  #pragma omp parallel for simd aligned(,
>    for (i = 0; i < 16; ++i)
>      ;
> -// expected-error at +2 {{expected expression}}
>  // expected-error at +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 at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp parallel for simd private(,
>    for (i = 0; i < 16; ++i)
>      ;
>  #pragma omp parallel
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +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 at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp parallel for simd lastprivate(,
>    for (i = 0; i < 16; ++i)
>      ;
>  #pragma omp parallel
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +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 at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp parallel for simd firstprivate(,
>    for (i = 0; i < 16; ++i)
>      ;
>  #pragma omp parallel
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp parallel for simd firstprivate(, )
>    for (i = 0; i < 16; ++i)
>      ;
>
> Modified: cfe/trunk/test/OpenMP/parallel_for_simd_private_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_simd_private_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_for_simd_private_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_for_simd_private_messages.cpp Thu Mar
> 31 04:13:44 2016
> @@ -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}}
>
> Modified: cfe/trunk/test/OpenMP/parallel_for_simd_reduction_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_simd_reduction_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_for_simd_reduction_messages.cpp
> (original)
> +++ cfe/trunk/test/OpenMP/parallel_for_simd_reduction_messages.cpp Thu Mar
> 31 04:13:44 2016
> @@ -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}}
>
> Modified: cfe/trunk/test/OpenMP/parallel_private_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_private_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_private_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_private_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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}}
>
> Modified: cfe/trunk/test/OpenMP/parallel_reduction_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_reduction_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_reduction_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_reduction_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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();
>
> Modified: cfe/trunk/test/OpenMP/parallel_sections_copyin_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_sections_copyin_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_sections_copyin_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_sections_copyin_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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();
>    }
>
> Modified: cfe/trunk/test/OpenMP/parallel_sections_firstprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_sections_firstprivate_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_sections_firstprivate_messages.cpp
> (original)
> +++ cfe/trunk/test/OpenMP/parallel_sections_firstprivate_messages.cpp Thu
> Mar 31 04:13:44 2016
> @@ -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();
>    }
>
> Modified: cfe/trunk/test/OpenMP/parallel_sections_lastprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_sections_lastprivate_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_sections_lastprivate_messages.cpp
> (original)
> +++ cfe/trunk/test/OpenMP/parallel_sections_lastprivate_messages.cpp Thu
> Mar 31 04:13:44 2016
> @@ -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();
>    }
>
> Modified: cfe/trunk/test/OpenMP/parallel_sections_misc_messages.c
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_sections_misc_messages.c?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_sections_misc_messages.c (original)
> +++ cfe/trunk/test/OpenMP/parallel_sections_misc_messages.c Thu Mar 31
> 04:13:44 2016
> @@ -115,12 +115,12 @@ void test_private() {
>      foo();
>    }
>  // expected-error at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp parallel sections private(,
>    {
>      foo();
>    }
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp parallel sections private(, )
>    {
>      foo();
> @@ -166,12 +166,12 @@ void test_lastprivate() {
>    }
>
>  // expected-error at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp parallel sections lastprivate(,
>    {
>      foo();
>    }
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp parallel sections lastprivate(, )
>    {
>      foo();
> @@ -217,12 +217,12 @@ void test_firstprivate() {
>    }
>
>  // expected-error at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp parallel sections firstprivate(,
>    {
>      foo();
>    }
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp parallel sections firstprivate(, )
>    {
>      foo();
>
> Modified: cfe/trunk/test/OpenMP/parallel_sections_private_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_sections_private_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_sections_private_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_sections_private_messages.cpp Thu Mar
> 31 04:13:44 2016
> @@ -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();
>    }
>
> Modified: cfe/trunk/test/OpenMP/parallel_sections_reduction_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_sections_reduction_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_sections_reduction_messages.cpp
> (original)
> +++ cfe/trunk/test/OpenMP/parallel_sections_reduction_messages.cpp Thu Mar
> 31 04:13:44 2016
> @@ -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();
>    }
>
> Modified: cfe/trunk/test/OpenMP/parallel_sections_shared_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_sections_shared_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_sections_shared_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_sections_shared_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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(); }
>
> Modified: cfe/trunk/test/OpenMP/parallel_shared_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_shared_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_shared_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_shared_messages.cpp Thu Mar 31 04:13:44
> 2016
> @@ -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}}
>
> Modified: cfe/trunk/test/OpenMP/sections_firstprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/sections_firstprivate_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/sections_firstprivate_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/sections_firstprivate_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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();
>    }
>
> Modified: cfe/trunk/test/OpenMP/sections_lastprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/sections_lastprivate_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/sections_lastprivate_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/sections_lastprivate_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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();
>    }
>
> Modified: cfe/trunk/test/OpenMP/sections_misc_messages.c
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/sections_misc_messages.c?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/sections_misc_messages.c (original)
> +++ cfe/trunk/test/OpenMP/sections_misc_messages.c Thu Mar 31 04:13:44 2016
> @@ -122,13 +122,13 @@ void test_private() {
>    }
>  #pragma omp parallel
>  // expected-error at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp sections private(,
>    {
>      foo();
>    }
>  #pragma omp parallel
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp sections private(, )
>    {
>      foo();
> @@ -182,13 +182,13 @@ void test_lastprivate() {
>
>  #pragma omp parallel
>  // expected-error at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp sections lastprivate(,
>    {
>      foo();
>    }
>  #pragma omp parallel
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp sections lastprivate(, )
>    {
>      foo();
> @@ -242,13 +242,13 @@ void test_firstprivate() {
>
>  #pragma omp parallel
>  // expected-error at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp sections firstprivate(,
>    {
>      foo();
>    }
>  #pragma omp parallel
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp sections firstprivate(, )
>    {
>      foo();
>
> Modified: cfe/trunk/test/OpenMP/sections_private_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/sections_private_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/sections_private_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/sections_private_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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();
>    }
>
> Modified: cfe/trunk/test/OpenMP/sections_reduction_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/sections_reduction_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/sections_reduction_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/sections_reduction_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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();
>    }
>
> Modified: cfe/trunk/test/OpenMP/simd_aligned_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/simd_aligned_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/simd_aligned_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/simd_aligned_messages.cpp Thu Mar 31 04:13:44
> 2016
> @@ -119,7 +119,7 @@ template<class I, class C> int foomain(I
>    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 at +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;
>
> Modified: cfe/trunk/test/OpenMP/simd_lastprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/simd_lastprivate_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/simd_lastprivate_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/simd_lastprivate_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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}}
>
> Modified: cfe/trunk/test/OpenMP/simd_linear_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/simd_linear_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/simd_linear_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/simd_linear_messages.cpp Thu Mar 31 04:13:44 2016
> @@ -121,7 +121,7 @@ template<class I, class C> int foomain(I
>    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;
>
> Modified: cfe/trunk/test/OpenMP/simd_misc_messages.c
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/simd_misc_messages.c?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/simd_misc_messages.c (original)
> +++ cfe/trunk/test/OpenMP/simd_misc_messages.c Thu Mar 31 04:13:44 2016
> @@ -376,12 +376,10 @@ void test_linear() {
>  #pragma omp simd linear(
>    for (i = 0; i < 16; ++i)
>      ;
> -// expected-error at +2 {{expected expression}}
>  // expected-error at +1 {{expected expression}} expected-error at +1
> {{expected ')'}} expected-note at +1 {{to match this '('}}
>  #pragma omp simd linear(,
>    for (i = 0; i < 16; ++i)
>      ;
> -// expected-error at +2 {{expected expression}}
>  // expected-error at +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 at +2 {{expected expression}}
>  // expected-error at +1 {{expected expression}} expected-error at +1
> {{expected ')'}} expected-note at +1 {{to match this '('}}
>  #pragma omp simd aligned(,
>    for (i = 0; i < 16; ++i)
>      ;
> -// expected-error at +2 {{expected expression}}
>  // expected-error at +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 at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp simd private(,
>    for (i = 0; i < 16; ++i)
>      ;
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp simd private(, )
>    for (i = 0; i < 16; ++i)
>      ;
> @@ -632,11 +628,11 @@ void test_lastprivate() {
>      ;
>
>  // expected-error at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp simd lastprivate(,
>    for (i = 0; i < 16; ++i)
>      ;
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp simd lastprivate(, )
>    for (i = 0; i < 16; ++i)
>      ;
>
> Modified: cfe/trunk/test/OpenMP/simd_private_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/simd_private_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/simd_private_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/simd_private_messages.cpp Thu Mar 31 04:13:44
> 2016
> @@ -99,7 +99,7 @@ template<class I, class C> int foomain(I
>    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;
>
> Modified: cfe/trunk/test/OpenMP/simd_reduction_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/simd_reduction_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/simd_reduction_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/simd_reduction_messages.cpp Thu Mar 31 04:13:44
> 2016
> @@ -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}}
>
> Modified: cfe/trunk/test/OpenMP/single_copyprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/single_copyprivate_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/single_copyprivate_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/single_copyprivate_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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
>
> Modified: cfe/trunk/test/OpenMP/single_firstprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/single_firstprivate_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/single_firstprivate_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/single_firstprivate_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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}}
>
> Modified: cfe/trunk/test/OpenMP/single_misc_messages.c
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/single_misc_messages.c?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/single_misc_messages.c (original)
> +++ cfe/trunk/test/OpenMP/single_misc_messages.c Thu Mar 31 04:13:44 2016
> @@ -86,11 +86,11 @@ void test_private() {
>    foo();
>  #pragma omp parallel
>  // expected-error at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp single private(,
>    foo();
>  #pragma omp parallel
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp single private(, )
>    foo();
>  #pragma omp parallel
> @@ -128,11 +128,11 @@ void test_firstprivate() {
>
>  #pragma omp parallel
>  // expected-error at +2 {{expected ')'}} expected-note at +2 {{to match this
> '('}}
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp single firstprivate(,
>    foo();
>  #pragma omp parallel
> -// expected-error at +1 2 {{expected expression}}
> +// expected-error at +1 {{expected expression}}
>  #pragma omp single firstprivate(, )
>    foo();
>  #pragma omp parallel
>
> Modified: cfe/trunk/test/OpenMP/single_private_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/single_private_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/single_private_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/single_private_messages.cpp Thu Mar 31 04:13:44
> 2016
> @@ -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();
>
> Modified: cfe/trunk/test/OpenMP/target_firstprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/target_firstprivate_messages.cpp?rev=265003&r1=265002&r2=265003&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/target_firstprivate_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/target_firstprivate_messages.cpp Thu Mar 31
> 04:13:44 2016
> @@ -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 {{e...
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20160331/98c0faec/attachment-0001.html>


More information about the cfe-commits mailing list