From: Richard Smith Date: Tue, 6 Oct 2020 01:39:33 +0000 (-0700) Subject: Make OpenMP tests less brittle in the face of changes in constant X-Git-Tag: llvmorg-13-init~10047 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ebf6fd633ef83b747bac721aafc3677d2c47aef1;p=platform%2Fupstream%2Fllvm.git Make OpenMP tests less brittle in the face of changes in constant evaluation diagnostics. --- diff --git a/clang/test/OpenMP/distribute_collapse_messages.cpp b/clang/test/OpenMP/distribute_collapse_messages.cpp index 6a0c8c3..c14b7da 100644 --- a/clang/test/OpenMP/distribute_collapse_messages.cpp +++ b/clang/test/OpenMP/distribute_collapse_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L - // expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp distribute collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp distribute collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp distribute collapse () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp distribute collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 2 {{argument to 'collapse' clause must be a strictly positive integer value}} @@ -38,18 +36,16 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp distribute collapse ((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'collapse' clause}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp distribute', but found only 1}} -#if __cplusplus >= 201103L - // expected-note@+5 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp distribute' cannot contain more than one 'collapse' clause}} // expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} - // expected-error@+1 2 {{integral constant expression}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp distribute collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp distribute collapse (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -75,15 +71,11 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp distribute', but found only 1}} #pragma omp distribute collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp distribute' are ignored}} expected-note {{as specified in 'collapse' clause}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp distribute', but found only 1}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif - #pragma omp distribute collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} + + #pragma omp distribute collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+5 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif - // expected-error@+3 {{integral constant expression}} + + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp distribute' cannot contain more than one 'collapse' clause}} // expected-error@+1 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp distribute collapse (foobool(argc)), collapse (true), collapse (-5) @@ -91,7 +83,7 @@ int main(int argc, char **argv) { #pragma omp distribute collapse (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/distribute_parallel_for_collapse_messages.cpp b/clang/test/OpenMP/distribute_parallel_for_collapse_messages.cpp index 3883575..2d9e4fc 100644 --- a/clang/test/OpenMP/distribute_parallel_for_collapse_messages.cpp +++ b/clang/test/OpenMP/distribute_parallel_for_collapse_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target #pragma omp teams #pragma omp distribute parallel for collapse // expected-error {{expected '(' after 'collapse'}} @@ -34,9 +33,8 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target #pragma omp teams - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp distribute parallel for collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target @@ -52,12 +50,9 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #pragma omp teams #pragma omp distribute parallel for collapse ((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'collapse' clause}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp distribute parallel for', but found only 1}} - // expected-error@+8 2 {{directive '#pragma omp distribute parallel for' cannot contain more than one 'collapse' clause}} - // expected-error@+7 {{argument to 'collapse' clause must be a strictly positive integer value}} - // expected-error@+6 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+5 2 {{directive '#pragma omp distribute parallel for' cannot contain more than one 'collapse' clause}} + // expected-error@+4 {{argument to 'collapse' clause must be a strictly positive integer value}} + // expected-error@+3 2 {{integral constant expression}} expected-note@+3 0+{{constant expression}} #pragma omp target #pragma omp teams #pragma omp distribute parallel for collapse (foobool(argc)), collapse (true), collapse (-5) @@ -67,7 +62,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #pragma omp distribute parallel for collapse (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+6 2 {{integral constant expression}} + // expected-error@+6 2 {{integral constant expression}} expected-note@+6 0+{{constant expression}} #else // expected-error@+4 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -111,18 +106,12 @@ int main(int argc, char **argv) { #pragma omp teams #pragma omp distribute parallel for collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp distribute parallel for' are ignored}} expected-note {{as specified in 'collapse' clause}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp distribute parallel for', but found only 1}} - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} #pragma omp target #pragma omp teams #pragma omp distribute parallel for collapse (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+8 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+6{{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+5 {{integral constant expression}} expected-note@+5 0+{{constant expression}} // expected-error@+4 2 {{directive '#pragma omp distribute parallel for' cannot contain more than one 'collapse' clause}} // expected-error@+3 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp target @@ -134,7 +123,7 @@ int main(int argc, char **argv) { #pragma omp distribute parallel for collapse (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+6 {{integral constant expression}} + // expected-error@+6 {{integral constant expression}} expected-note@+6 0+{{constant expression}} #else // expected-error@+4 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/distribute_parallel_for_simd_collapse_messages.cpp b/clang/test/OpenMP/distribute_parallel_for_simd_collapse_messages.cpp index ff9a728..d58c6f2 100644 --- a/clang/test/OpenMP/distribute_parallel_for_simd_collapse_messages.cpp +++ b/clang/test/OpenMP/distribute_parallel_for_simd_collapse_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target #pragma omp teams #pragma omp distribute parallel for simd collapse // expected-error {{expected '(' after 'collapse'}} @@ -34,9 +33,8 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target #pragma omp teams - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp distribute parallel for simd collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target @@ -52,12 +50,9 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #pragma omp teams #pragma omp distribute parallel for simd collapse ((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'collapse' clause}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp distribute parallel for simd', but found only 1}} - // expected-error@+8 2 {{directive '#pragma omp distribute parallel for simd' cannot contain more than one 'collapse' clause}} - // expected-error@+7 {{argument to 'collapse' clause must be a strictly positive integer value}} - // expected-error@+6 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+5 2 {{directive '#pragma omp distribute parallel for simd' cannot contain more than one 'collapse' clause}} + // expected-error@+4 {{argument to 'collapse' clause must be a strictly positive integer value}} + // expected-error@+3 2 {{integral constant expression}} expected-note@+3 0+{{constant expression}} #pragma omp target #pragma omp teams #pragma omp distribute parallel for simd collapse (foobool(argc)), collapse (true), collapse (-5) @@ -67,7 +62,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #pragma omp distribute parallel for simd collapse (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+6 2 {{integral constant expression}} + // expected-error@+6 2 {{integral constant expression}} expected-note@+6 0+{{constant expression}} #else // expected-error@+4 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -111,18 +106,12 @@ int main(int argc, char **argv) { #pragma omp teams #pragma omp distribute parallel for simd collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp distribute parallel for simd' are ignored}} expected-note {{as specified in 'collapse' clause}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp distribute parallel for simd', but found only 1}} - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} #pragma omp target #pragma omp teams #pragma omp distribute parallel for simd collapse (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+8 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+6{{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+5 {{integral constant expression}} expected-note@+5 0+{{constant expression}} // expected-error@+4 2 {{directive '#pragma omp distribute parallel for simd' cannot contain more than one 'collapse' clause}} // expected-error@+3 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp target @@ -134,7 +123,7 @@ int main(int argc, char **argv) { #pragma omp distribute parallel for simd collapse (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+6 {{integral constant expression}} + // expected-error@+6 {{integral constant expression}} expected-note@+6 0+{{constant expression}} #else // expected-error@+4 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/distribute_parallel_for_simd_safelen_messages.cpp b/clang/test/OpenMP/distribute_parallel_for_simd_safelen_messages.cpp index 2d659ef..eba65f7 100644 --- a/clang/test/OpenMP/distribute_parallel_for_simd_safelen_messages.cpp +++ b/clang/test/OpenMP/distribute_parallel_for_simd_safelen_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target #pragma omp teams @@ -40,7 +39,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #pragma omp target #pragma omp teams -#pragma omp distribute parallel for simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-error {{expected ')'}} +#pragma omp distribute parallel for simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-note 0+{{constant expression}} expected-error {{expected ')'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -62,14 +61,11 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -#if __cplusplus >= 201103L - // expected-note@+7 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif #pragma omp target #pragma omp teams // expected-error@+3 2 {{directive '#pragma omp distribute parallel for simd' cannot contain more than one 'safelen' clause}} // expected-error@+2 {{argument to 'safelen' clause must be a strictly positive integer value}} -// expected-error@+1 2 {{integral constant expression}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp distribute parallel for simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -81,7 +77,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+6 2 {{integral constant expression}} + // expected-error@+6 2 {{integral constant expression}} expected-note@+6 0+{{constant expression}} #else // expected-error@+4 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -137,23 +133,18 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + #pragma omp target #pragma omp teams -#pragma omp parallel for simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} +#pragma omp parallel for simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+7 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif #pragma omp target #pragma omp teams // expected-error@+3 {{argument to 'safelen' clause must be a strictly positive integer value}} // expected-error@+2 2 {{directive '#pragma omp parallel for simd' cannot contain more than one 'safelen' clause}} -// expected-error@+1 {{integral constant expression}} +// expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel for simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; @@ -165,7 +156,7 @@ int main(int argc, char **argv) { argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+6 {{integral constant expression}} + // expected-error@+6 {{integral constant expression}} expected-note@+6 0+{{constant expression}} #else // expected-error@+4 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/distribute_parallel_for_simd_simdlen_messages.cpp b/clang/test/OpenMP/distribute_parallel_for_simd_simdlen_messages.cpp index b4f40e8..e035f16 100644 --- a/clang/test/OpenMP/distribute_parallel_for_simd_simdlen_messages.cpp +++ b/clang/test/OpenMP/distribute_parallel_for_simd_simdlen_messages.cpp @@ -5,20 +5,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target #pragma omp teams #pragma omp distribute parallel for simd simdlen // expected-error {{expected '(' after 'simdlen'}} @@ -37,9 +36,8 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -// expected-error@+5 {{expected ')'}} expected-note@+5 {{to match this '('}} -// expected-error@+4 2 {{integral constant expression}} -// expected-note@+3 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} +// expected-error@+4 {{expected ')'}} expected-note@+4 {{to match this '('}} +// expected-error@+3 2 {{integral constant expression}} expected-note@+3 0+{{constant expression}} #pragma omp target #pragma omp teams #pragma omp distribute parallel for simd simdlen (argc @@ -65,14 +63,11 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -#if __cplusplus >= 201103L - // expected-note@+7 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif #pragma omp target #pragma omp teams // expected-error@+3 2 {{directive '#pragma omp distribute parallel for simd' cannot contain more than one 'simdlen' clause}} // expected-error@+2 {{argument to 'simdlen' clause must be a strictly positive integer value}} -// expected-error@+1 2 {{integral constant expression}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp distribute parallel for simd simdlen (foobool(argc)), simdlen (true), simdlen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -84,7 +79,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+6 2 {{integral constant expression}} + // expected-error@+6 2 {{integral constant expression}} expected-note@+6 0+{{constant expression}} #else // expected-error@+4 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -140,22 +135,15 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif #pragma omp target #pragma omp teams -#pragma omp distribute parallel for simd simdlen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} +#pragma omp distribute parallel for simd simdlen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - -#if __cplusplus >= 201103L - // expected-note@+7 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif #pragma omp target #pragma omp teams -// expected-error@+3 {{integral constant expression}} +// expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp distribute parallel for simd' cannot contain more than one 'simdlen' clause}} // expected-error@+1 {{argument to 'simdlen' clause must be a strictly positive integer value}} #pragma omp distribute parallel for simd simdlen (foobool(argc)), simdlen (true), simdlen (-5) @@ -169,7 +157,7 @@ int main(int argc, char **argv) { argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+6 {{integral constant expression}} + // expected-error@+6 {{integral constant expression}} expected-note@+6 0+{{constant expression}} #else // expected-error@+4 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/distribute_simd_collapse_messages.cpp b/clang/test/OpenMP/distribute_simd_collapse_messages.cpp index 418094b..98b02ed 100644 --- a/clang/test/OpenMP/distribute_simd_collapse_messages.cpp +++ b/clang/test/OpenMP/distribute_simd_collapse_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target #pragma omp teams #pragma omp distribute simd collapse // expected-error {{expected '(' after 'collapse'}} @@ -34,9 +33,8 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target #pragma omp teams - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp distribute simd collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target @@ -52,12 +50,9 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #pragma omp teams #pragma omp distribute simd collapse ((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'collapse' clause}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp distribute simd', but found only 1}} - // expected-error@+8 2 {{directive '#pragma omp distribute simd' cannot contain more than one 'collapse' clause}} - // expected-error@+7 {{argument to 'collapse' clause must be a strictly positive integer value}} - // expected-error@+6 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+5 2 {{directive '#pragma omp distribute simd' cannot contain more than one 'collapse' clause}} + // expected-error@+4 {{argument to 'collapse' clause must be a strictly positive integer value}} + // expected-error@+3 2 {{integral constant expression}} expected-note@+3 0+{{constant expression}} #pragma omp target #pragma omp teams #pragma omp distribute simd collapse (foobool(argc)), collapse (true), collapse (-5) @@ -67,7 +62,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #pragma omp distribute simd collapse (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+6 2 {{integral constant expression}} + // expected-error@+6 2 {{integral constant expression}} expected-note@+6 0+{{constant expression}} #else // expected-error@+4 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -111,18 +106,12 @@ int main(int argc, char **argv) { #pragma omp teams #pragma omp distribute simd collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp distribute simd' are ignored}} expected-note {{as specified in 'collapse' clause}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp distribute simd', but found only 1}} - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} #pragma omp target #pragma omp teams #pragma omp distribute simd collapse (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+8 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+6{{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+5 {{integral constant expression}} expected-note@+5 0+{{constant expression}} // expected-error@+4 2 {{directive '#pragma omp distribute simd' cannot contain more than one 'collapse' clause}} // expected-error@+3 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp target @@ -134,7 +123,7 @@ int main(int argc, char **argv) { #pragma omp distribute simd collapse (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+6 {{integral constant expression}} + // expected-error@+6 {{integral constant expression}} expected-note@+6 0+{{constant expression}} #else // expected-error@+4 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/distribute_simd_safelen_messages.cpp b/clang/test/OpenMP/distribute_simd_safelen_messages.cpp index bffc8ec..51d6778 100644 --- a/clang/test/OpenMP/distribute_simd_safelen_messages.cpp +++ b/clang/test/OpenMP/distribute_simd_safelen_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target #pragma omp teams @@ -40,7 +39,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #pragma omp target #pragma omp teams -#pragma omp distribute simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-error {{expected ')'}} +#pragma omp distribute simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-note 0+{{constant expression}} expected-error {{expected ')'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -62,14 +61,11 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -#if __cplusplus >= 201103L - // expected-note@+7 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif #pragma omp target #pragma omp teams // expected-error@+3 2 {{directive '#pragma omp distribute simd' cannot contain more than one 'safelen' clause}} // expected-error@+2 {{argument to 'safelen' clause must be a strictly positive integer value}} -// expected-error@+1 2 {{integral constant expression}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp distribute simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -81,7 +77,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+6 2 {{integral constant expression}} + // expected-error@+6 2 {{integral constant expression}} expected-note@+6 0+{{constant expression}} #else // expected-error@+4 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -137,23 +133,18 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + #pragma omp target #pragma omp teams -#pragma omp parallel for simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} +#pragma omp parallel for simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+7 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif #pragma omp target #pragma omp teams // expected-error@+3 {{argument to 'safelen' clause must be a strictly positive integer value}} // expected-error@+2 2 {{directive '#pragma omp parallel for simd' cannot contain more than one 'safelen' clause}} -// expected-error@+1 {{integral constant expression}} +// expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel for simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; @@ -165,7 +156,7 @@ int main(int argc, char **argv) { argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+6 {{integral constant expression}} + // expected-error@+6 {{integral constant expression}} expected-note@+6 0+{{constant expression}} #else // expected-error@+4 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/distribute_simd_simdlen_messages.cpp b/clang/test/OpenMP/distribute_simd_simdlen_messages.cpp index bffc8ec..51d6778 100644 --- a/clang/test/OpenMP/distribute_simd_simdlen_messages.cpp +++ b/clang/test/OpenMP/distribute_simd_simdlen_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target #pragma omp teams @@ -40,7 +39,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #pragma omp target #pragma omp teams -#pragma omp distribute simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-error {{expected ')'}} +#pragma omp distribute simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-note 0+{{constant expression}} expected-error {{expected ')'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -62,14 +61,11 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -#if __cplusplus >= 201103L - // expected-note@+7 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif #pragma omp target #pragma omp teams // expected-error@+3 2 {{directive '#pragma omp distribute simd' cannot contain more than one 'safelen' clause}} // expected-error@+2 {{argument to 'safelen' clause must be a strictly positive integer value}} -// expected-error@+1 2 {{integral constant expression}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp distribute simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -81,7 +77,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+6 2 {{integral constant expression}} + // expected-error@+6 2 {{integral constant expression}} expected-note@+6 0+{{constant expression}} #else // expected-error@+4 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -137,23 +133,18 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + #pragma omp target #pragma omp teams -#pragma omp parallel for simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} +#pragma omp parallel for simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+7 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif #pragma omp target #pragma omp teams // expected-error@+3 {{argument to 'safelen' clause must be a strictly positive integer value}} // expected-error@+2 2 {{directive '#pragma omp parallel for simd' cannot contain more than one 'safelen' clause}} -// expected-error@+1 {{integral constant expression}} +// expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel for simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; @@ -165,7 +156,7 @@ int main(int argc, char **argv) { argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+6 {{integral constant expression}} + // expected-error@+6 {{integral constant expression}} expected-note@+6 0+{{constant expression}} #else // expected-error@+4 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/for_collapse_messages.cpp b/clang/test/OpenMP/for_collapse_messages.cpp index 07974be..07630ff 100644 --- a/clang/test/OpenMP/for_collapse_messages.cpp +++ b/clang/test/OpenMP/for_collapse_messages.cpp @@ -12,29 +12,27 @@ // RUN: %clang_cc1 -verify=expected,omp50 -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify=expected,omp50 -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp for collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp for collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp for collapse () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp for collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 2 {{argument to 'collapse' clause must be a strictly positive integer value}} @@ -44,18 +42,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp for collapse ((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'collapse' clause}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp for', but found only 1}} - // expected-error@+6 2 {{directive '#pragma omp for' cannot contain more than one 'collapse' clause}} - // expected-error@+5 {{argument to 'collapse' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp for' cannot contain more than one 'collapse' clause}} + // expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp for collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp for collapse (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -81,16 +76,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp for', but found only 1}} #pragma omp for collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp for' are ignored}} expected-note {{as specified in 'collapse' clause}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp for', but found only 1}} - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp for collapse (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp for' cannot contain more than one 'collapse' clause}} // expected-error@+1 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp for collapse (foobool(argc)), collapse (true), collapse (-5) @@ -98,7 +87,7 @@ int main(int argc, char **argv) { #pragma omp for collapse (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/for_ordered_clause.cpp b/clang/test/OpenMP/for_ordered_clause.cpp index 537e52b..d9dbb82 100644 --- a/clang/test/OpenMP/for_ordered_clause.cpp +++ b/clang/test/OpenMP/for_ordered_clause.cpp @@ -5,22 +5,21 @@ // RUN: %clang_cc1 -verify -fopenmp-simd %s // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s + +// expected-note@* 0+{{declared here}} // SIMD-ONLY0-NOT: {{__kmpc|__tgt}} void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp for ordered for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i - ST]; @@ -30,9 +29,8 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here} #pragma omp for ordered() // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i - ST]; -// expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} -// expected-error@+2 2 {{integral constant expression}} -// expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} +// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp for ordered(argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i - ST]; @@ -46,12 +44,9 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here} #pragma omp for ordered((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'ordered' clause}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i - ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp for', but found only 1}} -// expected-error@+6 2 {{directive '#pragma omp for' cannot contain more than one 'ordered' clause}} -// expected-error@+5 {{argument to 'ordered' clause must be a strictly positive integer value}} -// expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L -// expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif +// expected-error@+3 2 {{directive '#pragma omp for' cannot contain more than one 'ordered' clause}} +// expected-error@+2 {{argument to 'ordered' clause must be a strictly positive integer value}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp for ordered(foobool(argc)), ordered(true), ordered(-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i - ST]; @@ -59,7 +54,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i - ST]; #if __cplusplus <= 199711L -// expected-error@+4 2 {{integral constant expression}} +// expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -101,17 +96,11 @@ int main(int argc, char **argv) { #pragma omp for ordered(2 + 2)) // expected-warning {{extra tokens at the end of '#pragma omp for' are ignored}} expected-note {{as specified in 'ordered' clause}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i - 4]; // expected-error {{expected 4 for loops after '#pragma omp for', but found only 1}} -// expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L -// expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif +// expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp for ordered(foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i - 4]; -// expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L -// expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif +// expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp for' cannot contain more than one 'ordered' clause}} // expected-error@+1 {{argument to 'ordered' clause must be a strictly positive integer value}} #pragma omp for ordered(foobool(argc)), ordered(true), ordered(-5) @@ -121,7 +110,7 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i - 4]; #if __cplusplus <= 199711L -// expected-error@+4 {{integral constant expression}} +// expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/for_simd_collapse_messages.cpp b/clang/test/OpenMP/for_simd_collapse_messages.cpp index efd9d39..d9f8a2d 100644 --- a/clang/test/OpenMP/for_simd_collapse_messages.cpp +++ b/clang/test/OpenMP/for_simd_collapse_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp for simd collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp for simd collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp for simd collapse () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp for simd collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 2 {{argument to 'collapse' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp for simd collapse ((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'collapse' clause}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp for simd', but found only 1}} - // expected-error@+6 2 {{directive '#pragma omp for simd' cannot contain more than one 'collapse' clause}} - // expected-error@+5 {{argument to 'collapse' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp for simd' cannot contain more than one 'collapse' clause}} + // expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp for simd collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp for simd collapse (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -75,16 +70,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp for simd', but found only 1}} #pragma omp for simd collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp for simd' are ignored}} expected-note {{as specified in 'collapse' clause}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp for simd', but found only 1}} - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp for simd collapse (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp for simd' cannot contain more than one 'collapse' clause}} // expected-error@+1 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp for simd collapse (foobool(argc)), collapse (true), collapse (-5) @@ -92,7 +81,7 @@ int main(int argc, char **argv) { #pragma omp for simd collapse (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/for_simd_safelen_messages.cpp b/clang/test/OpenMP/for_simd_safelen_messages.cpp index f714297..aaade5d 100644 --- a/clang/test/OpenMP/for_simd_safelen_messages.cpp +++ b/clang/test/OpenMP/for_simd_safelen_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp for simd safelen // expected-error {{expected '(' after 'safelen'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp for simd safelen ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp for simd safelen () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp for simd safelen (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 {{argument to 'safelen' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp for simd safelen ((ST > 0) ? 1 + ST : 2) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+6 2 {{directive '#pragma omp for simd' cannot contain more than one 'safelen' clause}} - // expected-error@+5 {{argument to 'safelen' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp for simd' cannot contain more than one 'safelen' clause}} + // expected-error@+2 {{argument to 'safelen' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp for simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp for simd safelen (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -73,16 +68,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #pragma omp for simd safelen (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp for simd' are ignored}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp for simd safelen (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp for simd' cannot contain more than one 'safelen' clause}} // expected-error@+1 {{argument to 'safelen' clause must be a strictly positive integer value}} #pragma omp for simd safelen (foobool(argc)), safelen (true), safelen (-5) @@ -90,7 +79,7 @@ int main(int argc, char **argv) { #pragma omp for simd safelen (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/for_simd_simdlen_messages.cpp b/clang/test/OpenMP/for_simd_simdlen_messages.cpp index eb0455e..fa270ab 100644 --- a/clang/test/OpenMP/for_simd_simdlen_messages.cpp +++ b/clang/test/OpenMP/for_simd_simdlen_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp for simd simdlen // expected-error {{expected '(' after 'simdlen'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp for simd simdlen ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp for simd simdlen () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp for simd simdlen (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 {{argument to 'simdlen' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp for simd simdlen ((ST > 0) ? 1 + ST : 2) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+6 2 {{directive '#pragma omp for simd' cannot contain more than one 'simdlen' clause}} - // expected-error@+5 {{argument to 'simdlen' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp for simd' cannot contain more than one 'simdlen' clause}} + // expected-error@+2 {{argument to 'simdlen' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp for simd simdlen (foobool(argc)), simdlen (true), simdlen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp for simd simdlen (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -73,16 +68,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #pragma omp for simd simdlen (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp for simd' are ignored}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp for simd simdlen (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp for simd' cannot contain more than one 'simdlen' clause}} // expected-error@+1 {{argument to 'simdlen' clause must be a strictly positive integer value}} #pragma omp for simd simdlen (foobool(argc)), simdlen (true), simdlen (-5) @@ -90,7 +79,7 @@ int main(int argc, char **argv) { #pragma omp for simd simdlen (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/master_taskloop_collapse_messages.cpp b/clang/test/OpenMP/master_taskloop_collapse_messages.cpp index 99cc426..b6a20ee 100644 --- a/clang/test/OpenMP/master_taskloop_collapse_messages.cpp +++ b/clang/test/OpenMP/master_taskloop_collapse_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp master taskloop collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp master taskloop collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp master taskloop collapse () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp master taskloop collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 2 {{argument to 'collapse' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp master taskloop collapse ((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'collapse' clause}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp master taskloop', but found only 1}} - // expected-error@+6 2 {{directive '#pragma omp master taskloop' cannot contain more than one 'collapse' clause}} - // expected-error@+5 {{argument to 'collapse' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp master taskloop' cannot contain more than one 'collapse' clause}} + // expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp master taskloop collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp master taskloop collapse (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -75,16 +70,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp master taskloop', but found only 1}} #pragma omp master taskloop collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp master taskloop' are ignored}} expected-note {{as specified in 'collapse' clause}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp master taskloop', but found only 1}} - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp master taskloop collapse (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp master taskloop' cannot contain more than one 'collapse' clause}} // expected-error@+1 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp master taskloop collapse (foobool(argc)), collapse (true), collapse (-5) @@ -92,7 +81,7 @@ int main(int argc, char **argv) { #pragma omp master taskloop collapse (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/master_taskloop_simd_collapse_messages.cpp b/clang/test/OpenMP/master_taskloop_simd_collapse_messages.cpp index 787c50a..74d68bb 100644 --- a/clang/test/OpenMP/master_taskloop_simd_collapse_messages.cpp +++ b/clang/test/OpenMP/master_taskloop_simd_collapse_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp master taskloop simd collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp master taskloop simd collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp master taskloop simd collapse () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp master taskloop simd collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 2 {{argument to 'collapse' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp master taskloop simd collapse ((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'collapse' clause}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp master taskloop simd', but found only 1}} - // expected-error@+6 2 {{directive '#pragma omp master taskloop simd' cannot contain more than one 'collapse' clause}} - // expected-error@+5 {{argument to 'collapse' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp master taskloop simd' cannot contain more than one 'collapse' clause}} + // expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp master taskloop simd collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp master taskloop simd collapse (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -75,16 +70,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp master taskloop simd', but found only 1}} #pragma omp master taskloop simd collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp master taskloop simd' are ignored}} expected-note {{as specified in 'collapse' clause}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp master taskloop simd', but found only 1}} - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp master taskloop simd collapse (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp master taskloop simd' cannot contain more than one 'collapse' clause}} // expected-error@+1 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp master taskloop simd collapse (foobool(argc)), collapse (true), collapse (-5) @@ -92,7 +81,7 @@ int main(int argc, char **argv) { #pragma omp master taskloop simd collapse (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/master_taskloop_simd_safelen_messages.cpp b/clang/test/OpenMP/master_taskloop_simd_safelen_messages.cpp index 9420cde..b92f463 100644 --- a/clang/test/OpenMP/master_taskloop_simd_safelen_messages.cpp +++ b/clang/test/OpenMP/master_taskloop_simd_safelen_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp master taskloop simd safelen // expected-error {{expected '(' after 'safelen'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp master taskloop simd safelen ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp master taskloop simd safelen () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp master taskloop simd safelen (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 {{argument to 'safelen' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp master taskloop simd safelen ((ST > 0) ? 1 + ST : 2) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+6 2 {{directive '#pragma omp master taskloop simd' cannot contain more than one 'safelen' clause}} - // expected-error@+5 {{argument to 'safelen' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp master taskloop simd' cannot contain more than one 'safelen' clause}} + // expected-error@+2 {{argument to 'safelen' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp master taskloop simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp master taskloop simd safelen (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -73,16 +68,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #pragma omp master taskloop simd safelen (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp master taskloop simd' are ignored}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp master taskloop simd safelen (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp master taskloop simd' cannot contain more than one 'safelen' clause}} // expected-error@+1 {{argument to 'safelen' clause must be a strictly positive integer value}} #pragma omp master taskloop simd safelen (foobool(argc)), safelen (true), safelen (-5) @@ -90,7 +79,7 @@ int main(int argc, char **argv) { #pragma omp master taskloop simd safelen (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/master_taskloop_simd_simdlen_messages.cpp b/clang/test/OpenMP/master_taskloop_simd_simdlen_messages.cpp index 36abee7..5fc0b16 100644 --- a/clang/test/OpenMP/master_taskloop_simd_simdlen_messages.cpp +++ b/clang/test/OpenMP/master_taskloop_simd_simdlen_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp master taskloop simd simdlen // expected-error {{expected '(' after 'simdlen'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp master taskloop simd simdlen ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp master taskloop simd simdlen () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp master taskloop simd simdlen (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 {{argument to 'simdlen' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp master taskloop simd simdlen ((ST > 0) ? 1 + ST : 2) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+6 2 {{directive '#pragma omp master taskloop simd' cannot contain more than one 'simdlen' clause}} - // expected-error@+5 {{argument to 'simdlen' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp master taskloop simd' cannot contain more than one 'simdlen' clause}} + // expected-error@+2 {{argument to 'simdlen' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp master taskloop simd simdlen (foobool(argc)), simdlen (true), simdlen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp master taskloop simd simdlen (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -73,16 +68,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #pragma omp master taskloop simd simdlen (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp master taskloop simd' are ignored}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp master taskloop simd simdlen (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp master taskloop simd' cannot contain more than one 'simdlen' clause}} // expected-error@+1 {{argument to 'simdlen' clause must be a strictly positive integer value}} #pragma omp master taskloop simd simdlen (foobool(argc)), simdlen (true), simdlen (-5) @@ -90,7 +79,7 @@ int main(int argc, char **argv) { #pragma omp master taskloop simd simdlen (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/parallel_for_collapse_messages.cpp b/clang/test/OpenMP/parallel_for_collapse_messages.cpp index ba48ce5..5ad5628 100644 --- a/clang/test/OpenMP/parallel_for_collapse_messages.cpp +++ b/clang/test/OpenMP/parallel_for_collapse_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp parallel for collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel for collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel for collapse () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel for collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 2 {{argument to 'collapse' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel for collapse ((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'collapse' clause}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp parallel for', but found only 1}} - // expected-error@+6 2 {{directive '#pragma omp parallel for' cannot contain more than one 'collapse' clause}} - // expected-error@+5 {{argument to 'collapse' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp parallel for' cannot contain more than one 'collapse' clause}} + // expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel for collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel for collapse (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -75,16 +70,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp parallel for', but found only 1}} #pragma omp parallel for collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp parallel for' are ignored}} expected-note {{as specified in 'collapse' clause}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp parallel for', but found only 1}} - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel for collapse (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4{{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp parallel for' cannot contain more than one 'collapse' clause}} // expected-error@+1 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp parallel for collapse (foobool(argc)), collapse (true), collapse (-5) @@ -92,7 +81,7 @@ int main(int argc, char **argv) { #pragma omp parallel for collapse (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/parallel_for_ordered_messages.cpp b/clang/test/OpenMP/parallel_for_ordered_messages.cpp index 7b46191..3d6a8f2 100644 --- a/clang/test/OpenMP/parallel_for_ordered_messages.cpp +++ b/clang/test/OpenMP/parallel_for_ordered_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp parallel for ordered for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i - ST]; @@ -29,9 +28,8 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here} #pragma omp parallel for ordered() // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i - ST]; -// expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} -// expected-error@+2 2 {{integral constant expression}} -// expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} +// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel for ordered(argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i - ST]; @@ -45,12 +43,9 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here} #pragma omp parallel for ordered((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'ordered' clause}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i - ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp parallel for', but found only 1}} -// expected-error@+6 2 {{directive '#pragma omp parallel for' cannot contain more than one 'ordered' clause}} -// expected-error@+5 {{argument to 'ordered' clause must be a strictly positive integer value}} -// expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L -// expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif +// expected-error@+3 2 {{directive '#pragma omp parallel for' cannot contain more than one 'ordered' clause}} +// expected-error@+2 {{argument to 'ordered' clause must be a strictly positive integer value}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel for ordered(foobool(argc)), ordered(true), ordered(-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i - ST]; @@ -58,7 +53,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i - ST]; #if __cplusplus <= 199711L -// expected-error@+4 2 {{integral constant expression}} +// expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -92,17 +87,11 @@ int main(int argc, char **argv) { #pragma omp parallel for ordered(2 + 2)) // expected-warning {{extra tokens at the end of '#pragma omp parallel for' are ignored}} expected-note {{as specified in 'ordered' clause}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i - 4]; // expected-error {{expected 4 for loops after '#pragma omp parallel for', but found only 1}} -// expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L -// expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif +// expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel for ordered(foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i - 4]; -// expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L -// expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif +// expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp parallel for' cannot contain more than one 'ordered' clause}} // expected-error@+1 {{argument to 'ordered' clause must be a strictly positive integer value}} #pragma omp parallel for ordered(foobool(argc)), ordered(true), ordered(-5) @@ -112,7 +101,7 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i - 4]; #if __cplusplus <= 199711L -// expected-error@+4 {{integral constant expression}} +// expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/parallel_for_simd_collapse_messages.cpp b/clang/test/OpenMP/parallel_for_simd_collapse_messages.cpp index f04b188..7c12ce8 100644 --- a/clang/test/OpenMP/parallel_for_simd_collapse_messages.cpp +++ b/clang/test/OpenMP/parallel_for_simd_collapse_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp parallel for simd collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel for simd collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel for simd collapse () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel for simd collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 2 {{argument to 'collapse' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel for simd collapse ((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'collapse' clause}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp parallel for simd', but found only 1}} - // expected-error@+6 2 {{directive '#pragma omp parallel for simd' cannot contain more than one 'collapse' clause}} - // expected-error@+5 {{argument to 'collapse' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp parallel for simd' cannot contain more than one 'collapse' clause}} + // expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel for simd collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel for simd collapse (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -75,16 +70,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp parallel for simd', but found only 1}} #pragma omp parallel for simd collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp parallel for simd' are ignored}} expected-note {{as specified in 'collapse' clause}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp parallel for simd', but found only 1}} - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel for simd collapse (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp parallel for simd' cannot contain more than one 'collapse' clause}} // expected-error@+1 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp parallel for simd collapse (foobool(argc)), collapse (true), collapse (-5) @@ -92,7 +81,7 @@ int main(int argc, char **argv) { #pragma omp parallel for simd collapse (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/parallel_for_simd_safelen_messages.cpp b/clang/test/OpenMP/parallel_for_simd_safelen_messages.cpp index 29da9ff..e4facb1 100644 --- a/clang/test/OpenMP/parallel_for_simd_safelen_messages.cpp +++ b/clang/test/OpenMP/parallel_for_simd_safelen_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp parallel for simd safelen // expected-error {{expected '(' after 'safelen'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel for simd safelen ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel for simd safelen () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel for simd safelen (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 {{argument to 'safelen' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel for simd safelen ((ST > 0) ? 1 + ST : 2) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+6 2 {{directive '#pragma omp parallel for simd' cannot contain more than one 'safelen' clause}} - // expected-error@+5 {{argument to 'safelen' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp parallel for simd' cannot contain more than one 'safelen' clause}} + // expected-error@+2 {{argument to 'safelen' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel for simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel for simd safelen (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -73,16 +68,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #pragma omp parallel for simd safelen (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp parallel for simd' are ignored}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel for simd safelen (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp parallel for simd' cannot contain more than one 'safelen' clause}} // expected-error@+1 {{argument to 'safelen' clause must be a strictly positive integer value}} #pragma omp parallel for simd safelen (foobool(argc)), safelen (true), safelen (-5) @@ -90,7 +79,7 @@ int main(int argc, char **argv) { #pragma omp parallel for simd safelen (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/parallel_for_simd_simdlen_messages.cpp b/clang/test/OpenMP/parallel_for_simd_simdlen_messages.cpp index 8e0bf9c..3b225ab 100644 --- a/clang/test/OpenMP/parallel_for_simd_simdlen_messages.cpp +++ b/clang/test/OpenMP/parallel_for_simd_simdlen_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp parallel for simd simdlen // expected-error {{expected '(' after 'simdlen'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel for simd simdlen ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel for simd simdlen () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel for simd simdlen (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 {{argument to 'simdlen' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel for simd simdlen ((ST > 0) ? 1 + ST : 2) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+6 2 {{directive '#pragma omp parallel for simd' cannot contain more than one 'simdlen' clause}} - // expected-error@+5 {{argument to 'simdlen' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp parallel for simd' cannot contain more than one 'simdlen' clause}} + // expected-error@+2 {{argument to 'simdlen' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel for simd simdlen (foobool(argc)), simdlen (true), simdlen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel for simd simdlen (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -73,16 +68,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #pragma omp parallel for simd simdlen (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp parallel for simd' are ignored}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel for simd simdlen (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp parallel for simd' cannot contain more than one 'simdlen' clause}} // expected-error@+1 {{argument to 'simdlen' clause must be a strictly positive integer value}} #pragma omp parallel for simd simdlen (foobool(argc)), simdlen (true), simdlen (-5) @@ -90,7 +79,7 @@ int main(int argc, char **argv) { #pragma omp parallel for simd simdlen (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/parallel_master_taskloop_collapse_messages.cpp b/clang/test/OpenMP/parallel_master_taskloop_collapse_messages.cpp index d93222a..7306271 100644 --- a/clang/test/OpenMP/parallel_master_taskloop_collapse_messages.cpp +++ b/clang/test/OpenMP/parallel_master_taskloop_collapse_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp parallel master taskloop collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel master taskloop collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel master taskloop collapse () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel master taskloop collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 2 {{argument to 'collapse' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel master taskloop collapse ((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'collapse' clause}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp parallel master taskloop', but found only 1}} - // expected-error@+6 2 {{directive '#pragma omp parallel master taskloop' cannot contain more than one 'collapse' clause}} - // expected-error@+5 {{argument to 'collapse' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp parallel master taskloop' cannot contain more than one 'collapse' clause}} + // expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel master taskloop collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel master taskloop collapse (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -75,16 +70,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp parallel master taskloop', but found only 1}} #pragma omp parallel master taskloop collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp parallel master taskloop' are ignored}} expected-note {{as specified in 'collapse' clause}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp parallel master taskloop', but found only 1}} - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel master taskloop collapse (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp parallel master taskloop' cannot contain more than one 'collapse' clause}} // expected-error@+1 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp parallel master taskloop collapse (foobool(argc)), collapse (true), collapse (-5) @@ -92,7 +81,7 @@ int main(int argc, char **argv) { #pragma omp parallel master taskloop collapse (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/parallel_master_taskloop_simd_collapse_messages.cpp b/clang/test/OpenMP/parallel_master_taskloop_simd_collapse_messages.cpp index c97cec7..e5b6d01 100644 --- a/clang/test/OpenMP/parallel_master_taskloop_simd_collapse_messages.cpp +++ b/clang/test/OpenMP/parallel_master_taskloop_simd_collapse_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp parallel master taskloop simd collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel master taskloop simd collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel master taskloop simd collapse () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel master taskloop simd collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 2 {{argument to 'collapse' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel master taskloop simd collapse ((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'collapse' clause}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp parallel master taskloop simd', but found only 1}} - // expected-error@+6 2 {{directive '#pragma omp parallel master taskloop simd' cannot contain more than one 'collapse' clause}} - // expected-error@+5 {{argument to 'collapse' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp parallel master taskloop simd' cannot contain more than one 'collapse' clause}} + // expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel master taskloop simd collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel master taskloop simd collapse (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -75,16 +70,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp parallel master taskloop simd', but found only 1}} #pragma omp parallel master taskloop simd collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp parallel master taskloop simd' are ignored}} expected-note {{as specified in 'collapse' clause}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp parallel master taskloop simd', but found only 1}} - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel master taskloop simd collapse (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp parallel master taskloop simd' cannot contain more than one 'collapse' clause}} // expected-error@+1 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp parallel master taskloop simd collapse (foobool(argc)), collapse (true), collapse (-5) @@ -92,7 +81,7 @@ int main(int argc, char **argv) { #pragma omp parallel master taskloop simd collapse (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/parallel_master_taskloop_simd_safelen_messages.cpp b/clang/test/OpenMP/parallel_master_taskloop_simd_safelen_messages.cpp index 612a39f..94173de 100644 --- a/clang/test/OpenMP/parallel_master_taskloop_simd_safelen_messages.cpp +++ b/clang/test/OpenMP/parallel_master_taskloop_simd_safelen_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp parallel master taskloop simd safelen // expected-error {{expected '(' after 'safelen'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel master taskloop simd safelen ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel master taskloop simd safelen () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel master taskloop simd safelen (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 {{argument to 'safelen' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel master taskloop simd safelen ((ST > 0) ? 1 + ST : 2) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+6 2 {{directive '#pragma omp parallel master taskloop simd' cannot contain more than one 'safelen' clause}} - // expected-error@+5 {{argument to 'safelen' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp parallel master taskloop simd' cannot contain more than one 'safelen' clause}} + // expected-error@+2 {{argument to 'safelen' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel master taskloop simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel master taskloop simd safelen (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -73,16 +68,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #pragma omp parallel master taskloop simd safelen (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp parallel master taskloop simd' are ignored}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel master taskloop simd safelen (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp parallel master taskloop simd' cannot contain more than one 'safelen' clause}} // expected-error@+1 {{argument to 'safelen' clause must be a strictly positive integer value}} #pragma omp parallel master taskloop simd safelen (foobool(argc)), safelen (true), safelen (-5) @@ -90,7 +79,7 @@ int main(int argc, char **argv) { #pragma omp parallel master taskloop simd safelen (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/parallel_master_taskloop_simd_simdlen_messages.cpp b/clang/test/OpenMP/parallel_master_taskloop_simd_simdlen_messages.cpp index 16a543e..447dd80 100644 --- a/clang/test/OpenMP/parallel_master_taskloop_simd_simdlen_messages.cpp +++ b/clang/test/OpenMP/parallel_master_taskloop_simd_simdlen_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp parallel master taskloop simd simdlen // expected-error {{expected '(' after 'simdlen'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel master taskloop simd simdlen ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel master taskloop simd simdlen () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel master taskloop simd simdlen (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 {{argument to 'simdlen' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel master taskloop simd simdlen ((ST > 0) ? 1 + ST : 2) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+6 2 {{directive '#pragma omp parallel master taskloop simd' cannot contain more than one 'simdlen' clause}} - // expected-error@+5 {{argument to 'simdlen' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp parallel master taskloop simd' cannot contain more than one 'simdlen' clause}} + // expected-error@+2 {{argument to 'simdlen' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel master taskloop simd simdlen (foobool(argc)), simdlen (true), simdlen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp parallel master taskloop simd simdlen (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -73,16 +68,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #pragma omp parallel master taskloop simd simdlen (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp parallel master taskloop simd' are ignored}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp parallel master taskloop simd simdlen (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp parallel master taskloop simd' cannot contain more than one 'simdlen' clause}} // expected-error@+1 {{argument to 'simdlen' clause must be a strictly positive integer value}} #pragma omp parallel master taskloop simd simdlen (foobool(argc)), simdlen (true), simdlen (-5) @@ -90,7 +79,7 @@ int main(int argc, char **argv) { #pragma omp parallel master taskloop simd simdlen (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/simd_collapse_messages.cpp b/clang/test/OpenMP/simd_collapse_messages.cpp index 3791574..1ce3bef 100644 --- a/clang/test/OpenMP/simd_collapse_messages.cpp +++ b/clang/test/OpenMP/simd_collapse_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp simd collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp simd collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp simd collapse () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp simd collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 2 {{argument to 'collapse' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp simd collapse ((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'collapse' clause}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp simd', but found only 1}} - // expected-error@+6 2 {{directive '#pragma omp simd' cannot contain more than one 'collapse' clause}} - // expected-error@+5 {{argument to 'collapse' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp simd' cannot contain more than one 'collapse' clause}} + // expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp simd collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp simd collapse (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -75,16 +70,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp simd', but found only 1}} #pragma omp simd collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp simd' are ignored}} expected-note {{as specified in 'collapse' clause}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp simd', but found only 1}} - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp simd collapse (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp simd' cannot contain more than one 'collapse' clause}} // expected-error@+1 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp simd collapse (foobool(argc)), collapse (true), collapse (-5) @@ -92,7 +81,7 @@ int main(int argc, char **argv) { #pragma omp simd collapse (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/simd_safelen_messages.cpp b/clang/test/OpenMP/simd_safelen_messages.cpp index 2cc5a88..4269534 100644 --- a/clang/test/OpenMP/simd_safelen_messages.cpp +++ b/clang/test/OpenMP/simd_safelen_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp simd safelen // expected-error {{expected '(' after 'safelen'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp simd safelen ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp simd safelen () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp simd safelen (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 {{argument to 'safelen' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp simd safelen ((ST > 0) ? 1 + ST : 2) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+6 2 {{directive '#pragma omp simd' cannot contain more than one 'safelen' clause}} - // expected-error@+5 {{argument to 'safelen' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp simd' cannot contain more than one 'safelen' clause}} + // expected-error@+2 {{argument to 'safelen' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp simd safelen (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -73,16 +68,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #pragma omp simd safelen (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp simd' are ignored}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp simd safelen (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp simd' cannot contain more than one 'safelen' clause}} // expected-error@+1 {{argument to 'safelen' clause must be a strictly positive integer value}} #pragma omp simd safelen (foobool(argc)), safelen (true), safelen (-5) @@ -90,7 +79,7 @@ int main(int argc, char **argv) { #pragma omp simd safelen (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/simd_simdlen_messages.cpp b/clang/test/OpenMP/simd_simdlen_messages.cpp index d7f86e0..11dafda 100644 --- a/clang/test/OpenMP/simd_simdlen_messages.cpp +++ b/clang/test/OpenMP/simd_simdlen_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp simd simdlen // expected-error {{expected '(' after 'simdlen'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp simd simdlen ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp simd simdlen () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp simd simdlen (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 {{argument to 'simdlen' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp simd simdlen ((ST > 0) ? 1 + ST : 2) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+6 2 {{directive '#pragma omp simd' cannot contain more than one 'simdlen' clause}} - // expected-error@+5 {{argument to 'simdlen' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp simd' cannot contain more than one 'simdlen' clause}} + // expected-error@+2 {{argument to 'simdlen' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp simd simdlen (foobool(argc)), simdlen (true), simdlen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp simd simdlen (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -73,16 +68,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #pragma omp simd simdlen (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp simd' are ignored}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp simd simdlen (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp simd' cannot contain more than one 'simdlen' clause}} // expected-error@+1 {{argument to 'simdlen' clause must be a strictly positive integer value}} #pragma omp simd simdlen (foobool(argc)), simdlen (true), simdlen (-5) @@ -90,7 +79,7 @@ int main(int argc, char **argv) { #pragma omp simd simdlen (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/target_parallel_for_collapse_messages.cpp b/clang/test/OpenMP/target_parallel_for_collapse_messages.cpp index 0ee442c..d359d4e 100644 --- a/clang/test/OpenMP/target_parallel_for_collapse_messages.cpp +++ b/clang/test/OpenMP/target_parallel_for_collapse_messages.cpp @@ -6,29 +6,28 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } bool foobool(int argc) { -#if __cplusplus >= 201103L -// expected-note@-2 4 {{declared here}} -#endif + return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target parallel for collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target parallel for collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target parallel for collapse () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target parallel for collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 2 {{argument to 'collapse' clause must be a strictly positive integer value}} @@ -40,18 +39,16 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp target parallel for', but found only 1}} // expected-error@+3 2 {{directive '#pragma omp target parallel for' cannot contain more than one 'collapse' clause}} // expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} - // expected-error@+1 2 {{integral constant expression}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target parallel for collapse (foobool(argc)), collapse (true), collapse (-5) -#if __cplusplus >= 201103L -// expected-note@-2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target parallel for collapse (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus >= 201103L // expected-error@+4 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #else - // expected-error@+2 2 {{integral constant expression}} + // expected-error@+2 2 {{integral constant expression}} expected-note@+2 0+{{constant expression}} #endif #pragma omp target parallel for collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -75,25 +72,21 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp target parallel for', but found only 1}} #pragma omp target parallel for collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp target parallel for' are ignored}} expected-note {{as specified in 'collapse' clause}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp target parallel for', but found only 1}} - #pragma omp target parallel for collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} -#if __cplusplus >= 201103L -// expected-note@-2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + #pragma omp target parallel for collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} + for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+3 {{integral constant expression}} + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp target parallel for' cannot contain more than one 'collapse' clause}} // expected-error@+1 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp target parallel for collapse (foobool(argc)), collapse (true), collapse (-5) -#if __cplusplus >= 201103L -// expected-note@-2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #pragma omp target parallel for collapse (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus >= 201103L // expected-error@+4 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #else - // expected-error@+2 {{integral constant expression}} + // expected-error@+2 {{integral constant expression}} expected-note@+2 0+{{constant expression}} #endif #pragma omp target parallel for collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; diff --git a/clang/test/OpenMP/target_parallel_for_ordered_messages.cpp b/clang/test/OpenMP/target_parallel_for_ordered_messages.cpp index 8396273..188d944 100644 --- a/clang/test/OpenMP/target_parallel_for_ordered_messages.cpp +++ b/clang/test/OpenMP/target_parallel_for_ordered_messages.cpp @@ -6,20 +6,20 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } bool foobool(int argc) { -#if __cplusplus >= 201103L -// expected-note@-2 4 {{declared here}} -#endif + return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target parallel for ordered for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i - ST]; @@ -29,9 +29,8 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here} #pragma omp target parallel for ordered() // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i - ST]; -// expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} -// expected-error@+2 2 {{integral constant expression}} -// expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} +// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target parallel for ordered(argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i - ST]; @@ -45,12 +44,10 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here} #pragma omp target parallel for ordered((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'ordered' clause}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i - ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp target parallel for', but found only 1}} -#if __cplusplus >= 201103L -// expected-note@+5 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp target parallel for' cannot contain more than one 'ordered' clause}} // expected-error@+2 {{argument to 'ordered' clause must be a strictly positive integer value}} -// expected-error@+1 2 {{integral constant expression}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target parallel for ordered(foobool(argc)), ordered(true), ordered(-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i - ST]; @@ -60,7 +57,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here} #if __cplusplus >= 201103L // expected-error@+4 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #else - // expected-error@+2 2 {{integral constant expression}} + // expected-error@+2 2 {{integral constant expression}} expected-note@+2 0+{{constant expression}} #endif #pragma omp target parallel for ordered(argv[1] = 2) // expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) @@ -92,16 +89,12 @@ int main(int argc, char **argv) { #pragma omp target parallel for ordered(2 + 2)) // expected-warning {{extra tokens at the end of '#pragma omp target parallel for' are ignored}} expected-note {{as specified in 'ordered' clause}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i - 4]; // expected-error {{expected 4 for loops after '#pragma omp target parallel for', but found only 1}} -#if __cplusplus >= 201103L -// expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif -#pragma omp target parallel for ordered(foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} + +#pragma omp target parallel for ordered(foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i - 4]; -#if __cplusplus >= 201103L -// expected-note@+5 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif -// expected-error@+3 {{integral constant expression}} + +// expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp target parallel for' cannot contain more than one 'ordered' clause}} // expected-error@+1 {{argument to 'ordered' clause must be a strictly positive integer value}} #pragma omp target parallel for ordered(foobool(argc)), ordered(true), ordered(-5) @@ -113,7 +106,7 @@ int main(int argc, char **argv) { #if __cplusplus >= 201103L // expected-error@+4 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #else - // expected-error@+2 {{integral constant expression}} + // expected-error@+2 {{integral constant expression}} expected-note@+2 0+{{constant expression}} #endif #pragma omp target parallel for ordered(argv[1] = 2) // expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = 4; i < 12; i++) diff --git a/clang/test/OpenMP/target_parallel_for_simd_collapse_messages.cpp b/clang/test/OpenMP/target_parallel_for_simd_collapse_messages.cpp index 309ba48..7acb258 100644 --- a/clang/test/OpenMP/target_parallel_for_simd_collapse_messages.cpp +++ b/clang/test/OpenMP/target_parallel_for_simd_collapse_messages.cpp @@ -6,30 +6,28 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L - // expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} - int j; // expected-note {{declared here}} +template +T tmain(T argc, S **argv) { + int j; #pragma omp target parallel for simd collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target parallel for simd collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target parallel for simd collapse () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target parallel for simd collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 2 {{argument to 'collapse' clause must be a strictly positive integer value}} @@ -39,18 +37,16 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target parallel for simd collapse ((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'collapse' clause}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp target parallel for simd', but found only 1}} -#if __cplusplus >= 201103L - // expected-note@+5 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp target parallel for simd' cannot contain more than one 'collapse' clause}} // expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} - // expected-error@+1 2 {{integral constant expression}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target parallel for simd collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target parallel for simd collapse (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-note@+2 {{read of non-const variable 'j' is not allowed in a constant expression}} - // expected-error@+1 {{integral constant expression}} + + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target parallel for simd collapse (j=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target parallel for simd collapse (1) @@ -63,7 +59,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} } int main(int argc, char **argv) { - int j; // expected-note {{declared here}} + int j; #pragma omp target parallel for simd collapse // expected-error {{expected '(' after 'collapse'}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #pragma omp target parallel for simd collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} @@ -75,22 +71,20 @@ int main(int argc, char **argv) { #pragma omp target parallel for simd collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp target parallel for simd' are ignored}} expected-note {{as specified in 'collapse' clause}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp target parallel for simd', but found only 1}} #if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} + #endif - #pragma omp target parallel for simd collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} + #pragma omp target parallel for simd collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+5 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif - // expected-error@+3 {{integral constant expression}} + + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp target parallel for simd' cannot contain more than one 'collapse' clause}} // expected-error@+1 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp target parallel for simd collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #pragma omp target parallel for simd collapse (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-note@+2 {{read of non-const variable 'j' is not allowed in a constant expression}} - // expected-error@+1 {{integral constant expression}} + + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target parallel for simd collapse (j=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error@+3 {{statement after '#pragma omp target parallel for simd' must be a for loop}} diff --git a/clang/test/OpenMP/target_parallel_for_simd_ordered_messages.cpp b/clang/test/OpenMP/target_parallel_for_simd_ordered_messages.cpp index ed3e065..8dd7f68 100644 --- a/clang/test/OpenMP/target_parallel_for_simd_ordered_messages.cpp +++ b/clang/test/OpenMP/target_parallel_for_simd_ordered_messages.cpp @@ -6,21 +6,20 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L - // expected-note@+2 2 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} +template T tmain(T argc, S **argv) { - int j; // expected-note {{declared here}} + int j; #pragma omp target parallel for simd ordered for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i - ST]; @@ -56,8 +55,8 @@ T tmain(T argc, S **argv) { #pragma omp target parallel for simd ordered(S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i - ST]; -// expected-note@+2 {{read of non-const variable 'j' is not allowed in a constant expression}} -// expected-error@+1 {{integral constant expression}} + +// expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target parallel for simd ordered(j = 2) // expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i - ST]; @@ -76,7 +75,7 @@ T tmain(T argc, S **argv) { } int main(int argc, char **argv) { - int j; // expected-note {{declared here}} + int j; #pragma omp target parallel for simd ordered for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i - 4]; @@ -94,16 +93,12 @@ int main(int argc, char **argv) { #pragma omp target parallel for simd ordered(2 + 2)) // expected-warning {{extra tokens at the end of '#pragma omp target parallel for simd' are ignored}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i - 4]; -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif -#pragma omp target parallel for simd ordered(foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} + +#pragma omp target parallel for simd ordered(foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i - 4]; -#if __cplusplus >= 201103L - // expected-note@+5 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif -// expected-error@+3 {{integral constant expression}} + +// expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp target parallel for simd' cannot contain more than one 'ordered' clause}} // expected-error@+1 {{argument to 'ordered' clause must be a strictly positive integer value}} #pragma omp target parallel for simd ordered(foobool(argc)), ordered(true), ordered(-5) @@ -112,8 +107,8 @@ int main(int argc, char **argv) { #pragma omp target parallel for simd ordered(S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i - 4]; -// expected-note@+2 {{read of non-const variable 'j' is not allowed in a constant expression}} -// expected-error@+1 {{integral constant expression}} + +// expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target parallel for simd ordered(j = 2) // expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i - 4]; diff --git a/clang/test/OpenMP/target_parallel_for_simd_safelen_messages.cpp b/clang/test/OpenMP/target_parallel_for_simd_safelen_messages.cpp index f3d4104..ef47d78 100644 --- a/clang/test/OpenMP/target_parallel_for_simd_safelen_messages.cpp +++ b/clang/test/OpenMP/target_parallel_for_simd_safelen_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target parallel for simd safelen // expected-error {{expected '(' after 'safelen'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target parallel for simd safelen ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target parallel for simd safelen () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target parallel for simd safelen (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 {{argument to 'safelen' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target parallel for simd safelen ((ST > 0) ? 1 + ST : 2) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+6 2 {{directive '#pragma omp target parallel for simd' cannot contain more than one 'safelen' clause}} - // expected-error@+5 {{argument to 'safelen' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp target parallel for simd' cannot contain more than one 'safelen' clause}} + // expected-error@+2 {{argument to 'safelen' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target parallel for simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target parallel for simd safelen (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -73,16 +68,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #pragma omp target parallel for simd safelen (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp target parallel for simd' are ignored}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target parallel for simd safelen (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp target parallel for simd' cannot contain more than one 'safelen' clause}} // expected-error@+1 {{argument to 'safelen' clause must be a strictly positive integer value}} #pragma omp target parallel for simd safelen (foobool(argc)), safelen (true), safelen (-5) @@ -90,7 +79,7 @@ int main(int argc, char **argv) { #pragma omp target parallel for simd safelen (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/target_parallel_for_simd_simdlen_messages.cpp b/clang/test/OpenMP/target_parallel_for_simd_simdlen_messages.cpp index 9d17d54..7bf27e9d 100644 --- a/clang/test/OpenMP/target_parallel_for_simd_simdlen_messages.cpp +++ b/clang/test/OpenMP/target_parallel_for_simd_simdlen_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target parallel for simd simdlen // expected-error {{expected '(' after 'simdlen'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -29,9 +28,8 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #pragma omp target parallel for simd simdlen () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -// expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} -// expected-error@+2 2 {{integral constant expression}} -// expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} +// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target parallel for simd simdlen (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -45,12 +43,9 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #pragma omp target parallel for simd simdlen ((ST > 0) ? 1 + ST : 2) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+6 2 {{directive '#pragma omp target parallel for simd' cannot contain more than one 'simdlen' clause}} - // expected-error@+5 {{argument to 'simdlen' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp target parallel for simd' cannot contain more than one 'simdlen' clause}} + // expected-error@+2 {{argument to 'simdlen' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target parallel for simd simdlen (foobool(argc)), simdlen (true), simdlen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -58,7 +53,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -99,17 +94,11 @@ int main(int argc, char **argv) { #pragma omp target parallel for simd simdlen (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp target parallel for simd' are ignored}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target parallel for simd simdlen (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp target parallel for simd' cannot contain more than one 'simdlen' clause}} // expected-error@+1 {{argument to 'simdlen' clause must be a strictly positive integer value}} #pragma omp target parallel for simd simdlen (foobool(argc)), simdlen (true), simdlen (-5) @@ -119,7 +108,7 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/target_simd_collapse_messages.cpp b/clang/test/OpenMP/target_simd_collapse_messages.cpp index 0040816..00fa3c8 100644 --- a/clang/test/OpenMP/target_simd_collapse_messages.cpp +++ b/clang/test/OpenMP/target_simd_collapse_messages.cpp @@ -4,30 +4,28 @@ // RUN: %clang_cc1 -verify -fopenmp-simd %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} - int j; // expected-note {{declared here}} +template +T tmain(T argc, S **argv) { + int j; #pragma omp target simd collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target simd collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target simd collapse () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target simd collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 2 {{argument to 'collapse' clause must be a strictly positive integer value}} @@ -37,18 +35,16 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target simd collapse ((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'collapse' clause}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp target simd', but found only 1}} -#if __cplusplus >= 201103L - // expected-note@+5 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp target simd' cannot contain more than one 'collapse' clause}} // expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} - // expected-error@+1 2 {{integral constant expression}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target simd collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target simd collapse (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-note@+2 {{read of non-const variable 'j' is not allowed in a constant expression}} - // expected-error@+1 {{integral constant expression}} + + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target simd collapse (j=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target simd collapse (1) @@ -61,7 +57,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} } int main(int argc, char **argv) { - int j; // expected-note {{declared here}} + int j; #pragma omp target simd collapse // expected-error {{expected '(' after 'collapse'}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #pragma omp target simd collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} @@ -72,23 +68,19 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp target simd', but found only 1}} #pragma omp target simd collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp target simd' are ignored}} expected-note {{as specified in 'collapse' clause}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp target simd', but found only 1}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif - #pragma omp target simd collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} + + #pragma omp target simd collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+5 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif - // expected-error@+3 {{integral constant expression}} + + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp target simd' cannot contain more than one 'collapse' clause}} // expected-error@+1 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp target simd collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #pragma omp target simd collapse (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-note@+2 {{read of non-const variable 'j' is not allowed in a constant expression}} - // expected-error@+1 {{integral constant expression}} + + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target simd collapse (j=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error@+3 {{statement after '#pragma omp target simd' must be a for loop}} diff --git a/clang/test/OpenMP/target_simd_safelen_messages.cpp b/clang/test/OpenMP/target_simd_safelen_messages.cpp index b64af78..926cb9f 100644 --- a/clang/test/OpenMP/target_simd_safelen_messages.cpp +++ b/clang/test/OpenMP/target_simd_safelen_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target simd safelen // expected-error {{expected '(' after 'safelen'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target simd safelen ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target simd safelen () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target simd safelen (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 {{argument to 'safelen' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target simd safelen ((ST > 0) ? 1 + ST : 2) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+6 2 {{directive '#pragma omp target simd' cannot contain more than one 'safelen' clause}} - // expected-error@+5 {{argument to 'safelen' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp target simd' cannot contain more than one 'safelen' clause}} + // expected-error@+2 {{argument to 'safelen' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target simd safelen (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -73,16 +68,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #pragma omp target simd safelen (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp target simd' are ignored}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target simd safelen (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp target simd' cannot contain more than one 'safelen' clause}} // expected-error@+1 {{argument to 'safelen' clause must be a strictly positive integer value}} #pragma omp target simd safelen (foobool(argc)), safelen (true), safelen (-5) @@ -90,7 +79,7 @@ int main(int argc, char **argv) { #pragma omp target simd safelen (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/target_simd_simdlen_messages.cpp b/clang/test/OpenMP/target_simd_simdlen_messages.cpp index 30e8a31..595f88f 100644 --- a/clang/test/OpenMP/target_simd_simdlen_messages.cpp +++ b/clang/test/OpenMP/target_simd_simdlen_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target simd simdlen // expected-error {{expected '(' after 'simdlen'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -29,9 +28,8 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #pragma omp target simd simdlen () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -// expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} -// expected-error@+2 2 {{integral constant expression}} -// expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} +// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target simd simdlen (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -45,12 +43,9 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #pragma omp target simd simdlen ((ST > 0) ? 1 + ST : 2) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+6 2 {{directive '#pragma omp target simd' cannot contain more than one 'simdlen' clause}} - // expected-error@+5 {{argument to 'simdlen' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp target simd' cannot contain more than one 'simdlen' clause}} + // expected-error@+2 {{argument to 'simdlen' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target simd simdlen (foobool(argc)), simdlen (true), simdlen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -58,7 +53,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -99,17 +94,11 @@ int main(int argc, char **argv) { #pragma omp target simd simdlen (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp target simd' are ignored}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target simd simdlen (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp target simd' cannot contain more than one 'simdlen' clause}} // expected-error@+1 {{argument to 'simdlen' clause must be a strictly positive integer value}} #pragma omp target simd simdlen (foobool(argc)), simdlen (true), simdlen (-5) @@ -119,7 +108,7 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/target_teams_distribute_collapse_messages.cpp b/clang/test/OpenMP/target_teams_distribute_collapse_messages.cpp index 550f644..ef22b5f 100644 --- a/clang/test/OpenMP/target_teams_distribute_collapse_messages.cpp +++ b/clang/test/OpenMP/target_teams_distribute_collapse_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target teams distribute collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -32,9 +31,8 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -// expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} -// expected-error@+2 2 {{integral constant expression}} -// expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} +// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target teams distribute collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -52,12 +50,9 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp target teams distribute', but found only 1}} -#if __cplusplus >= 201103L -// expected-note@+5 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif // expected-error@+3 2 {{directive '#pragma omp target teams distribute' cannot contain more than one 'collapse' clause}} // expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} -// expected-error@+1 2 {{integral constant expression}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target teams distribute collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -67,7 +62,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -109,18 +104,12 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp target teams distribute', but found only 1}} -// expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L -// expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif +// expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target teams distribute collapse (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+5{{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif -// expected-error@+3 {{integral constant expression}} +// expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp target teams distribute' cannot contain more than one 'collapse' clause}} // expected-error@+1 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp target teams distribute collapse (foobool(argc)), collapse (true), collapse (-5) @@ -132,7 +121,7 @@ int main(int argc, char **argv) { argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/target_teams_distribute_parallel_for_collapse_messages.cpp b/clang/test/OpenMP/target_teams_distribute_parallel_for_collapse_messages.cpp index 4af605c..13d1a78 100644 --- a/clang/test/OpenMP/target_teams_distribute_parallel_for_collapse_messages.cpp +++ b/clang/test/OpenMP/target_teams_distribute_parallel_for_collapse_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd %s -std=c++98 -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd %s -std=c++11 -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target teams distribute parallel for collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -32,9 +31,8 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -// expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} -// expected-error@+2 2 {{integral constant expression}} -// expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} +// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target teams distribute parallel for collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -52,12 +50,9 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp target teams distribute parallel for', but found only 1}} -#if __cplusplus >= 201103L -// expected-note@+5 2 {{non-constexpr function 'foobool' cannot be used}} -#endif // expected-error@+3 2 {{directive '#pragma omp target teams distribute parallel for' cannot contain more than one 'collapse' clause}} // expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} -// expected-error@+1 2 {{integral constant expression}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target teams distribute parallel for collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -69,7 +64,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #if __cplusplus >= 201103L // expected-error@+4 2 {{integral constant expression must have integral or unscoped enumeration type}} #else -// expected-error@+2 2 {{integral constant expression}} +// expected-error@+2 2 {{integral constant expression}} expected-note@+2 0+{{constant expression}} #endif #pragma omp target teams distribute parallel for collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) @@ -109,17 +104,11 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp target teams distribute parallel for', but found only 1}} -#if __cplusplus >= 201103L -// expected-note@+2 {{non-constexpr function 'foobool' cannot be used}} -#endif -#pragma omp target teams distribute parallel for collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} +#pragma omp target teams distribute parallel for collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L -// expected-note@+5 {{non-constexpr function 'foobool' cannot be used}} -#endif -// expected-error@+3 {{integral constant expression}} +// expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp target teams distribute parallel for' cannot contain more than one 'collapse' clause}} // expected-error@+1 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp target teams distribute parallel for collapse (foobool(argc)), collapse (true), collapse (-5) @@ -133,7 +122,7 @@ int main(int argc, char **argv) { #if __cplusplus >= 201103L // expected-error@+4 {{integral constant expression must have integral or unscoped enumeration type}} #else -// expected-error@+2 {{integral constant expression}} +// expected-error@+2 {{integral constant expression}} expected-note@+2 0+{{constant expression}} #endif #pragma omp target teams distribute parallel for collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = 4; i < 12; i++) diff --git a/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_collapse_messages.cpp b/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_collapse_messages.cpp index 65be6e1..61508b5 100644 --- a/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_collapse_messages.cpp +++ b/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_collapse_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd %s -std=c++98 -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd %s -std=c++11 -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target teams distribute parallel for simd collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -32,9 +31,8 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -// expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} -// expected-error@+2 2 {{integral constant expression}} -// expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} +// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target teams distribute parallel for simd collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -52,12 +50,9 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp target teams distribute parallel for simd', but found only 1}} -#if __cplusplus >= 201103L -// expected-note@+5 2 {{non-constexpr function 'foobool' cannot be used}} -#endif // expected-error@+3 2 {{directive '#pragma omp target teams distribute parallel for simd' cannot contain more than one 'collapse' clause}} // expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} -// expected-error@+1 2 {{integral constant expression}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target teams distribute parallel for simd collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -69,7 +64,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #if __cplusplus >= 201103L // expected-error@+4 2 {{integral constant expression must have integral or unscoped enumeration type}} #else -// expected-error@+2 2 {{integral constant expression}} +// expected-error@+2 2 {{integral constant expression}} expected-note@+2 0+{{constant expression}} #endif #pragma omp target teams distribute parallel for simd collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) @@ -109,17 +104,11 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp target teams distribute parallel for simd', but found only 1}} -#if __cplusplus >= 201103L -// expected-note@+2 {{non-constexpr function 'foobool' cannot be used}} -#endif -#pragma omp target teams distribute parallel for simd collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} +#pragma omp target teams distribute parallel for simd collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L -// expected-note@+5 {{non-constexpr function 'foobool' cannot be used}} -#endif -// expected-error@+3 {{integral constant expression}} +// expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp target teams distribute parallel for simd' cannot contain more than one 'collapse' clause}} // expected-error@+1 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp target teams distribute parallel for simd collapse (foobool(argc)), collapse (true), collapse (-5) @@ -133,7 +122,7 @@ int main(int argc, char **argv) { #if __cplusplus >= 201103L // expected-error@+4 {{integral constant expression must have integral or unscoped enumeration type}} #else -// expected-error@+2 {{integral constant expression}} +// expected-error@+2 {{integral constant expression}} expected-note@+2 0+{{constant expression}} #endif #pragma omp target teams distribute parallel for simd collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = 4; i < 12; i++) diff --git a/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_safelen_messages.cpp b/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_safelen_messages.cpp index 5d0eaaf..31dfb7c 100644 --- a/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_safelen_messages.cpp +++ b/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_safelen_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target teams distribute parallel for simd safelen // expected-error {{expected '(' after 'safelen'}} for (int i = ST; i < N; i++) @@ -32,7 +31,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #pragma omp target teams distribute parallel for simd safelen () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -#pragma omp target teams distribute parallel for simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-error {{expected ')'}} +#pragma omp target teams distribute parallel for simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-note 0+{{constant expression}} expected-error {{expected ')'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -48,12 +47,9 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -#if __cplusplus >= 201103L - // expected-note@+5 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif // expected-error@+3 2 {{directive '#pragma omp target teams distribute parallel for simd' cannot contain more than one 'safelen' clause}} // expected-error@+2 {{argument to 'safelen' clause must be a strictly positive integer value}} -// expected-error@+1 2 {{integral constant expression}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target teams distribute parallel for simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -63,7 +59,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -103,19 +99,14 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif -#pragma omp target teams distribute parallel for simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} + +#pragma omp target teams distribute parallel for simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+5 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif // expected-error@+3 {{argument to 'safelen' clause must be a strictly positive integer value}} // expected-error@+2 2 {{directive '#pragma omp target teams distribute parallel for simd' cannot contain more than one 'safelen' clause}} -// expected-error@+1 {{integral constant expression}} +// expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target teams distribute parallel for simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; @@ -125,7 +116,7 @@ int main(int argc, char **argv) { argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_simdlen_messages.cpp b/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_simdlen_messages.cpp index 2e0f86c..14865e5 100644 --- a/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_simdlen_messages.cpp +++ b/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_simdlen_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target teams distribute parallel for simd safelen // expected-error {{expected '(' after 'safelen'}} for (int i = ST; i < N; i++) @@ -32,7 +31,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #pragma omp target teams distribute parallel for simd safelen () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -#pragma omp target teams distribute parallel for simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-error {{expected ')'}} +#pragma omp target teams distribute parallel for simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-note 0+{{constant expression}} expected-error {{expected ')'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -48,12 +47,9 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -#if __cplusplus >= 201103L - // expected-note@+5 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif // expected-error@+3 2 {{directive '#pragma omp target teams distribute parallel for simd' cannot contain more than one 'safelen' clause}} // expected-error@+2 {{argument to 'safelen' clause must be a strictly positive integer value}} -// expected-error@+1 2 {{integral constant expression}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target teams distribute parallel for simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -63,7 +59,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -103,19 +99,13 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif -#pragma omp target teams distribute parallel for simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} +#pragma omp target teams distribute parallel for simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+5 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif // expected-error@+3 {{argument to 'safelen' clause must be a strictly positive integer value}} // expected-error@+2 2 {{directive '#pragma omp target teams distribute parallel for simd' cannot contain more than one 'safelen' clause}} -// expected-error@+1 {{integral constant expression}} +// expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target teams distribute parallel for simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; @@ -125,7 +115,7 @@ int main(int argc, char **argv) { argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/target_teams_distribute_simd_collapse_messages.cpp b/clang/test/OpenMP/target_teams_distribute_simd_collapse_messages.cpp index 25e9961..500980f 100644 --- a/clang/test/OpenMP/target_teams_distribute_simd_collapse_messages.cpp +++ b/clang/test/OpenMP/target_teams_distribute_simd_collapse_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target teams distribute simd collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -32,9 +31,8 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -// expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} -// expected-error@+2 2 {{integral constant expression}} -// expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} +// expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target teams distribute simd collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -52,12 +50,9 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp target teams distribute simd', but found only 1}} -// expected-error@+6 2 {{directive '#pragma omp target teams distribute simd' cannot contain more than one 'collapse' clause}} -// expected-error@+5 {{argument to 'collapse' clause must be a strictly positive integer value}} -// expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L -// expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif +// expected-error@+3 2 {{directive '#pragma omp target teams distribute simd' cannot contain more than one 'collapse' clause}} +// expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target teams distribute simd collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -67,7 +62,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -109,19 +104,13 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp target teams distribute simd', but found only 1}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif -#pragma omp target teams distribute simd collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} +#pragma omp target teams distribute simd collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -// expected-error@+6 {{integral constant expression}} -// expected-error@+5 2 {{directive '#pragma omp target teams distribute simd' cannot contain more than one 'collapse' clause}} -// expected-error@+4 {{argument to 'collapse' clause must be a strictly positive integer value}} -#if __cplusplus >= 201103L -// expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif +// expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} +// expected-error@+2 2 {{directive '#pragma omp target teams distribute simd' cannot contain more than one 'collapse' clause}} +// expected-error@+1 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp target teams distribute simd collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; @@ -133,7 +122,7 @@ int main(int argc, char **argv) { #if __cplusplus >= 201103L // expected-error@+4 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #else - // expected-error@+2 {{integral constant expression}} + // expected-error@+2 {{integral constant expression}} expected-note@+2 0+{{constant expression}} #endif #pragma omp target teams distribute simd collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = 4; i < 12; i++) diff --git a/clang/test/OpenMP/target_teams_distribute_simd_safelen_messages.cpp b/clang/test/OpenMP/target_teams_distribute_simd_safelen_messages.cpp index af05525..a472b8e 100644 --- a/clang/test/OpenMP/target_teams_distribute_simd_safelen_messages.cpp +++ b/clang/test/OpenMP/target_teams_distribute_simd_safelen_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target teams distribute simd safelen // expected-error {{expected '(' after 'safelen'}} for (int i = ST; i < N; i++) @@ -32,7 +31,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #pragma omp target teams distribute simd safelen () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -#pragma omp target teams distribute simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-error {{expected ')'}} +#pragma omp target teams distribute simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-note 0+{{constant expression}} expected-error {{expected ')'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -48,12 +47,9 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -#if __cplusplus >= 201103L - // expected-note@+5 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif // expected-error@+3 2 {{directive '#pragma omp target teams distribute simd' cannot contain more than one 'safelen' clause}} // expected-error@+2 {{argument to 'safelen' clause must be a strictly positive integer value}} -// expected-error@+1 2 {{integral constant expression}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target teams distribute simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -63,7 +59,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -103,19 +99,14 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif -#pragma omp target teams distribute simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} + +#pragma omp target teams distribute simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+5 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif // expected-error@+3 {{argument to 'safelen' clause must be a strictly positive integer value}} // expected-error@+2 2 {{directive '#pragma omp target teams distribute simd' cannot contain more than one 'safelen' clause}} -// expected-error@+1 {{integral constant expression}} +// expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target teams distribute simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; @@ -125,7 +116,7 @@ int main(int argc, char **argv) { argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/target_teams_distribute_simd_simdlen_messages.cpp b/clang/test/OpenMP/target_teams_distribute_simd_simdlen_messages.cpp index f54da20..489bb80 100644 --- a/clang/test/OpenMP/target_teams_distribute_simd_simdlen_messages.cpp +++ b/clang/test/OpenMP/target_teams_distribute_simd_simdlen_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target teams distribute simd safelen // expected-error {{expected '(' after 'safelen'}} for (int i = ST; i < N; i++) @@ -32,7 +31,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #pragma omp target teams distribute simd safelen () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -#pragma omp target teams distribute simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-error {{expected ')'}} +#pragma omp target teams distribute simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-note 0+{{constant expression}} expected-error {{expected ')'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -48,12 +47,9 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -#if __cplusplus >= 201103L - // expected-note@+5 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif // expected-error@+3 2 {{directive '#pragma omp target teams distribute simd' cannot contain more than one 'safelen' clause}} // expected-error@+2 {{argument to 'safelen' clause must be a strictly positive integer value}} -// expected-error@+1 2 {{integral constant expression}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target teams distribute simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -63,7 +59,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -103,19 +99,14 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif -#pragma omp target teams distribute simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} + +#pragma omp target teams distribute simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+5 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif // expected-error@+3 {{argument to 'safelen' clause must be a strictly positive integer value}} // expected-error@+2 2 {{directive '#pragma omp target teams distribute simd' cannot contain more than one 'safelen' clause}} -// expected-error@+1 {{integral constant expression}} +// expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp target teams distribute simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; @@ -125,7 +116,7 @@ int main(int argc, char **argv) { argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/taskloop_collapse_messages.cpp b/clang/test/OpenMP/taskloop_collapse_messages.cpp index d004c92..b07f27a 100644 --- a/clang/test/OpenMP/taskloop_collapse_messages.cpp +++ b/clang/test/OpenMP/taskloop_collapse_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp taskloop collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp taskloop collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp taskloop collapse () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp taskloop collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 2 {{argument to 'collapse' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp taskloop collapse ((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'collapse' clause}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp taskloop', but found only 1}} - // expected-error@+6 2 {{directive '#pragma omp taskloop' cannot contain more than one 'collapse' clause}} - // expected-error@+5 {{argument to 'collapse' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp taskloop' cannot contain more than one 'collapse' clause}} + // expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp taskloop collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp taskloop collapse (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -75,16 +70,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp taskloop', but found only 1}} #pragma omp taskloop collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp taskloop' are ignored}} expected-note {{as specified in 'collapse' clause}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp taskloop', but found only 1}} - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp taskloop collapse (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp taskloop' cannot contain more than one 'collapse' clause}} // expected-error@+1 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp taskloop collapse (foobool(argc)), collapse (true), collapse (-5) @@ -92,7 +81,7 @@ int main(int argc, char **argv) { #pragma omp taskloop collapse (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/taskloop_simd_collapse_messages.cpp b/clang/test/OpenMP/taskloop_simd_collapse_messages.cpp index 4854509..59c8775 100644 --- a/clang/test/OpenMP/taskloop_simd_collapse_messages.cpp +++ b/clang/test/OpenMP/taskloop_simd_collapse_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp taskloop simd collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp taskloop simd collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp taskloop simd collapse () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp taskloop simd collapse (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 2 {{argument to 'collapse' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp taskloop simd collapse ((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'collapse' clause}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp taskloop simd', but found only 1}} - // expected-error@+6 2 {{directive '#pragma omp taskloop simd' cannot contain more than one 'collapse' clause}} - // expected-error@+5 {{argument to 'collapse' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp taskloop simd' cannot contain more than one 'collapse' clause}} + // expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp taskloop simd collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp taskloop simd collapse (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -75,16 +70,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp taskloop simd', but found only 1}} #pragma omp taskloop simd collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp taskloop simd' are ignored}} expected-note {{as specified in 'collapse' clause}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp taskloop simd', but found only 1}} - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp taskloop simd collapse (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp taskloop simd' cannot contain more than one 'collapse' clause}} // expected-error@+1 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp taskloop simd collapse (foobool(argc)), collapse (true), collapse (-5) @@ -92,7 +81,7 @@ int main(int argc, char **argv) { #pragma omp taskloop simd collapse (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/taskloop_simd_safelen_messages.cpp b/clang/test/OpenMP/taskloop_simd_safelen_messages.cpp index 491bc50..4930de7 100644 --- a/clang/test/OpenMP/taskloop_simd_safelen_messages.cpp +++ b/clang/test/OpenMP/taskloop_simd_safelen_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp taskloop simd safelen // expected-error {{expected '(' after 'safelen'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp taskloop simd safelen ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp taskloop simd safelen () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp taskloop simd safelen (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 {{argument to 'safelen' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp taskloop simd safelen ((ST > 0) ? 1 + ST : 2) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+6 2 {{directive '#pragma omp taskloop simd' cannot contain more than one 'safelen' clause}} - // expected-error@+5 {{argument to 'safelen' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp taskloop simd' cannot contain more than one 'safelen' clause}} + // expected-error@+2 {{argument to 'safelen' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp taskloop simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp taskloop simd safelen (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -73,16 +68,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #pragma omp taskloop simd safelen (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp taskloop simd' are ignored}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp taskloop simd safelen (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp taskloop simd' cannot contain more than one 'safelen' clause}} // expected-error@+1 {{argument to 'safelen' clause must be a strictly positive integer value}} #pragma omp taskloop simd safelen (foobool(argc)), safelen (true), safelen (-5) @@ -90,7 +79,7 @@ int main(int argc, char **argv) { #pragma omp taskloop simd safelen (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/taskloop_simd_simdlen_messages.cpp b/clang/test/OpenMP/taskloop_simd_simdlen_messages.cpp index cd935c9..af8c553 100644 --- a/clang/test/OpenMP/taskloop_simd_simdlen_messages.cpp +++ b/clang/test/OpenMP/taskloop_simd_simdlen_messages.cpp @@ -6,29 +6,27 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp taskloop simd simdlen // expected-error {{expected '(' after 'simdlen'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp taskloop simd simdlen ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp taskloop simd simdlen () // expected-error {{expected expression}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} - // expected-error@+2 2 {{integral constant expression}} - // expected-note@+1 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} + // expected-error@+2 {{expected ')'}} expected-note@+2 {{to match this '('}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp taskloop simd simdlen (argc for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error@+1 {{argument to 'simdlen' clause must be a strictly positive integer value}} @@ -38,18 +36,15 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp taskloop simd simdlen ((ST > 0) ? 1 + ST : 2) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; - // expected-error@+6 2 {{directive '#pragma omp taskloop simd' cannot contain more than one 'simdlen' clause}} - // expected-error@+5 {{argument to 'simdlen' clause must be a strictly positive integer value}} - // expected-error@+4 2 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 2 {{directive '#pragma omp taskloop simd' cannot contain more than one 'simdlen' clause}} + // expected-error@+2 {{argument to 'simdlen' clause must be a strictly positive integer value}} + // expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp taskloop simd simdlen (foobool(argc)), simdlen (true), simdlen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp taskloop simd simdlen (S) // expected-error {{'S' does not refer to a value}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+4 2 {{integral constant expression}} + // expected-error@+4 2 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -73,16 +68,10 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #pragma omp taskloop simd simdlen (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp taskloop simd' are ignored}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+4 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp taskloop simd simdlen (foobool(1) > 0 ? 1 : 2) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; - // expected-error@+6 {{integral constant expression}} -#if __cplusplus >= 201103L - // expected-note@+4 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} // expected-error@+2 2 {{directive '#pragma omp taskloop simd' cannot contain more than one 'simdlen' clause}} // expected-error@+1 {{argument to 'simdlen' clause must be a strictly positive integer value}} #pragma omp taskloop simd simdlen (foobool(argc)), simdlen (true), simdlen (-5) @@ -90,7 +79,7 @@ int main(int argc, char **argv) { #pragma omp taskloop simd simdlen (S1) // expected-error {{'S1' does not refer to a value}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+4 {{integral constant expression}} + // expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} #else // expected-error@+2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/teams_distribute_collapse_messages.cpp b/clang/test/OpenMP/teams_distribute_collapse_messages.cpp index f6c9fd9..50d8ab2 100644 --- a/clang/test/OpenMP/teams_distribute_collapse_messages.cpp +++ b/clang/test/OpenMP/teams_distribute_collapse_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd %s -std=c++98 -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd %s -std=c++11 -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target #pragma omp teams distribute collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) @@ -35,9 +34,8 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -// expected-error@+4 {{expected ')'}} expected-note@+4 {{to match this '('}} -// expected-error@+3 2 {{integral constant expression}} -// expected-note@+2 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} +// expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} +// expected-error@+2 2 {{integral constant expression}} expected-note@+2 0+{{constant expression}} #pragma omp target #pragma omp teams distribute collapse (argc for (int i = ST; i < N; i++) @@ -59,12 +57,9 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp teams distribute', but found only 1}} -#if __cplusplus >= 201103L -// expected-note@+6 2 {{non-constexpr function 'foobool' cannot be used}} -#endif // expected-error@+4 2 {{directive '#pragma omp teams distribute' cannot contain more than one 'collapse' clause}} // expected-error@+3 {{argument to 'collapse' clause must be a strictly positive integer value}} -// expected-error@+2 2 {{integral constant expression}} +// expected-error@+2 2 {{integral constant expression}} expected-note@+2 0+{{constant expression}} #pragma omp target #pragma omp teams distribute collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) @@ -78,7 +73,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #if __cplusplus >= 201103L // expected-error@+5 2 {{integral constant expression must have integral or unscoped enumeration type}} #else -// expected-error@+3 2 {{integral constant expression}} +// expected-error@+3 2 {{integral constant expression}} expected-note@+3 0+{{constant expression}} #endif #pragma omp target #pragma omp teams distribute collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} @@ -127,18 +122,12 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp teams distribute', but found only 1}} -#if __cplusplus >= 201103L -// expected-note@+3 {{non-constexpr function 'foobool' cannot be used}} -#endif #pragma omp target -#pragma omp teams distribute collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} +#pragma omp teams distribute collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L -// expected-note@+6 {{non-constexpr function 'foobool' cannot be used}} -#endif -// expected-error@+4 {{integral constant expression}} +// expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} // expected-error@+3 2 {{directive '#pragma omp teams distribute' cannot contain more than one 'collapse' clause}} // expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp target @@ -154,7 +143,7 @@ int main(int argc, char **argv) { #if __cplusplus >= 201103L // expected-error@+5 {{integral constant expression must have integral or unscoped enumeration type}} #else -// expected-error@+3 {{integral constant expression}} +// expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} #endif #pragma omp target #pragma omp teams distribute collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} diff --git a/clang/test/OpenMP/teams_distribute_parallel_for_collapse_messages.cpp b/clang/test/OpenMP/teams_distribute_parallel_for_collapse_messages.cpp index 1c83ac8..1e7d794 100644 --- a/clang/test/OpenMP/teams_distribute_parallel_for_collapse_messages.cpp +++ b/clang/test/OpenMP/teams_distribute_parallel_for_collapse_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd %s -std=c++98 -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd %s -std=c++11 -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target #pragma omp teams distribute parallel for collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) @@ -35,9 +34,8 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -// expected-error@+4 {{expected ')'}} expected-note@+4 {{to match this '('}} -// expected-error@+3 2 {{integral constant expression}} -// expected-note@+2 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} +// expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} +// expected-error@+2 2 {{integral constant expression}} expected-note@+2 0+{{constant expression}} #pragma omp target #pragma omp teams distribute parallel for collapse (argc for (int i = ST; i < N; i++) @@ -59,12 +57,9 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp teams distribute parallel for', but found only 1}} -#if __cplusplus >= 201103L -// expected-note@+6 2 {{non-constexpr function 'foobool' cannot be used}} -#endif // expected-error@+4 2 {{directive '#pragma omp teams distribute parallel for' cannot contain more than one 'collapse' clause}} // expected-error@+3 {{argument to 'collapse' clause must be a strictly positive integer value}} -// expected-error@+2 2 {{integral constant expression}} +// expected-error@+2 2 {{integral constant expression}} expected-note@+2 0+{{constant expression}} #pragma omp target #pragma omp teams distribute parallel for collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) @@ -77,7 +72,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #if __cplusplus >= 201103L // expected-error@+5 2 {{integral constant expression must have integral or unscoped enumeration type}} #else -// expected-error@+3 2 {{integral constant expression}} +// expected-error@+3 2 {{integral constant expression}} expected-note@+3 0+{{constant expression}} #endif #pragma omp target #pragma omp teams distribute parallel for collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} @@ -126,18 +121,12 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp teams distribute parallel for', but found only 1}} -#if __cplusplus >= 201103L -// expected-note@+3 {{non-constexpr function 'foobool' cannot be used}} -#endif #pragma omp target -#pragma omp teams distribute parallel for collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} +#pragma omp teams distribute parallel for collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L -// expected-note@+6 {{non-constexpr function 'foobool' cannot be used}} -#endif -// expected-error@+4 {{integral constant expression}} +// expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} // expected-error@+3 2 {{directive '#pragma omp teams distribute parallel for' cannot contain more than one 'collapse' clause}} // expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp target @@ -153,7 +142,7 @@ int main(int argc, char **argv) { #if __cplusplus >= 201103L // expected-error@+5 {{integral constant expression must have integral or unscoped enumeration type}} #else -// expected-error@+3 {{integral constant expression}} +// expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} #endif #pragma omp target #pragma omp teams distribute parallel for collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} diff --git a/clang/test/OpenMP/teams_distribute_parallel_for_simd_collapse_messages.cpp b/clang/test/OpenMP/teams_distribute_parallel_for_simd_collapse_messages.cpp index 8558f1b..63132be 100644 --- a/clang/test/OpenMP/teams_distribute_parallel_for_simd_collapse_messages.cpp +++ b/clang/test/OpenMP/teams_distribute_parallel_for_simd_collapse_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd %s -std=c++98 -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd %s -std=c++11 -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target #pragma omp teams distribute parallel for simd collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) @@ -35,9 +34,8 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -// expected-error@+4 {{expected ')'}} expected-note@+4 {{to match this '('}} -// expected-error@+3 2 {{integral constant expression}} -// expected-note@+2 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} +// expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} +// expected-error@+2 2 {{integral constant expression}} expected-note@+2 0+{{constant expression}} #pragma omp target #pragma omp teams distribute parallel for simd collapse (argc for (int i = ST; i < N; i++) @@ -59,12 +57,9 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp teams distribute parallel for simd', but found only 1}} -#if __cplusplus >= 201103L -// expected-note@+6 2 {{non-constexpr function 'foobool' cannot be used}} -#endif // expected-error@+4 2 {{directive '#pragma omp teams distribute parallel for simd' cannot contain more than one 'collapse' clause}} // expected-error@+3 {{argument to 'collapse' clause must be a strictly positive integer value}} -// expected-error@+2 2 {{integral constant expression}} +// expected-error@+2 2 {{integral constant expression}} expected-note@+2 0+{{constant expression}} #pragma omp target #pragma omp teams distribute parallel for simd collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) @@ -77,7 +72,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} #if __cplusplus >= 201103L // expected-error@+5 2 {{integral constant expression must have integral or unscoped enumeration type}} #else -// expected-error@+3 2 {{integral constant expression}} +// expected-error@+3 2 {{integral constant expression}} expected-note@+3 0+{{constant expression}} #endif #pragma omp target #pragma omp teams distribute parallel for simd collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} @@ -126,18 +121,12 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp teams distribute parallel for simd', but found only 1}} -#if __cplusplus >= 201103L -// expected-note@+3 {{non-constexpr function 'foobool' cannot be used}} -#endif #pragma omp target -#pragma omp teams distribute parallel for simd collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} +#pragma omp teams distribute parallel for simd collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L -// expected-note@+6 {{non-constexpr function 'foobool' cannot be used}} -#endif -// expected-error@+4 {{integral constant expression}} +// expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} // expected-error@+3 2 {{directive '#pragma omp teams distribute parallel for simd' cannot contain more than one 'collapse' clause}} // expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp target @@ -153,7 +142,7 @@ int main(int argc, char **argv) { #if __cplusplus >= 201103L // expected-error@+5 {{integral constant expression must have integral or unscoped enumeration type}} #else -// expected-error@+3 {{integral constant expression}} +// expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} #endif #pragma omp target #pragma omp teams distribute parallel for simd collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} diff --git a/clang/test/OpenMP/teams_distribute_parallel_for_simd_safelen_messages.cpp b/clang/test/OpenMP/teams_distribute_parallel_for_simd_safelen_messages.cpp index 019427f..122b9cbe 100644 --- a/clang/test/OpenMP/teams_distribute_parallel_for_simd_safelen_messages.cpp +++ b/clang/test/OpenMP/teams_distribute_parallel_for_simd_safelen_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target #pragma omp teams distribute parallel for simd safelen // expected-error {{expected '(' after 'safelen'}} @@ -36,7 +35,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target -#pragma omp teams distribute parallel for simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-error {{expected ')'}} +#pragma omp teams distribute parallel for simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-note 0+{{constant expression}} expected-error {{expected ')'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -55,13 +54,10 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -#if __cplusplus >= 201103L - // expected-note@+6 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif #pragma omp target // expected-error@+3 2 {{directive '#pragma omp teams distribute parallel for simd' cannot contain more than one 'safelen' clause}} // expected-error@+2 {{argument to 'safelen' clause must be a strictly positive integer value}} -// expected-error@+1 2 {{integral constant expression}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp teams distribute parallel for simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -72,7 +68,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+5 2 {{integral constant expression}} + // expected-error@+5 2 {{integral constant expression}} expected-note@+5 0+{{constant expression}} #else // expected-error@+3 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -120,21 +116,16 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+3 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + #pragma omp target -#pragma omp teams distribute parallel for simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} +#pragma omp teams distribute parallel for simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+6 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif #pragma omp target // expected-error@+3 {{argument to 'safelen' clause must be a strictly positive integer value}} // expected-error@+2 2 {{directive '#pragma omp teams distribute parallel for simd' cannot contain more than one 'safelen' clause}} -// expected-error@+1 {{integral constant expression}} +// expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp teams distribute parallel for simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; @@ -145,7 +136,7 @@ int main(int argc, char **argv) { argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+5 {{integral constant expression}} + // expected-error@+5 {{integral constant expression}} expected-note@+5 0+{{constant expression}} #else // expected-error@+3 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/teams_distribute_parallel_for_simd_simdlen_messages.cpp b/clang/test/OpenMP/teams_distribute_parallel_for_simd_simdlen_messages.cpp index 019427f..122b9cbe 100644 --- a/clang/test/OpenMP/teams_distribute_parallel_for_simd_simdlen_messages.cpp +++ b/clang/test/OpenMP/teams_distribute_parallel_for_simd_simdlen_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target #pragma omp teams distribute parallel for simd safelen // expected-error {{expected '(' after 'safelen'}} @@ -36,7 +35,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target -#pragma omp teams distribute parallel for simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-error {{expected ')'}} +#pragma omp teams distribute parallel for simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-note 0+{{constant expression}} expected-error {{expected ')'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -55,13 +54,10 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -#if __cplusplus >= 201103L - // expected-note@+6 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif #pragma omp target // expected-error@+3 2 {{directive '#pragma omp teams distribute parallel for simd' cannot contain more than one 'safelen' clause}} // expected-error@+2 {{argument to 'safelen' clause must be a strictly positive integer value}} -// expected-error@+1 2 {{integral constant expression}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp teams distribute parallel for simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -72,7 +68,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+5 2 {{integral constant expression}} + // expected-error@+5 2 {{integral constant expression}} expected-note@+5 0+{{constant expression}} #else // expected-error@+3 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -120,21 +116,16 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+3 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + #pragma omp target -#pragma omp teams distribute parallel for simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} +#pragma omp teams distribute parallel for simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+6 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif #pragma omp target // expected-error@+3 {{argument to 'safelen' clause must be a strictly positive integer value}} // expected-error@+2 2 {{directive '#pragma omp teams distribute parallel for simd' cannot contain more than one 'safelen' clause}} -// expected-error@+1 {{integral constant expression}} +// expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp teams distribute parallel for simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; @@ -145,7 +136,7 @@ int main(int argc, char **argv) { argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+5 {{integral constant expression}} + // expected-error@+5 {{integral constant expression}} expected-note@+5 0+{{constant expression}} #else // expected-error@+3 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/teams_distribute_simd_collapse_messages.cpp b/clang/test/OpenMP/teams_distribute_simd_collapse_messages.cpp index e7ce4d9..bc1833d 100644 --- a/clang/test/OpenMP/teams_distribute_simd_collapse_messages.cpp +++ b/clang/test/OpenMP/teams_distribute_simd_collapse_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target #pragma omp teams distribute simd collapse // expected-error {{expected '(' after 'collapse'}} for (int i = ST; i < N; i++) @@ -35,9 +34,8 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -// expected-error@+4 {{expected ')'}} expected-note@+4 {{to match this '('}} -// expected-error@+3 2 {{integral constant expression}} -// expected-note@+2 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} +// expected-error@+3 {{expected ')'}} expected-note@+3 {{to match this '('}} +// expected-error@+2 2 {{integral constant expression}} expected-note@+2 0+{{constant expression}} #pragma omp target #pragma omp teams distribute simd collapse (argc for (int i = ST; i < N; i++) @@ -59,12 +57,9 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp teams distribute simd', but found only 1}} -// expected-error@+7 2 {{directive '#pragma omp teams distribute simd' cannot contain more than one 'collapse' clause}} -// expected-error@+6 {{argument to 'collapse' clause must be a strictly positive integer value}} -// expected-error@+5 2 {{integral constant expression}} -#if __cplusplus >= 201103L -// expected-note@+3 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif +// expected-error@+4 2 {{directive '#pragma omp teams distribute simd' cannot contain more than one 'collapse' clause}} +// expected-error@+3 {{argument to 'collapse' clause must be a strictly positive integer value}} +// expected-error@+2 2 {{integral constant expression}} expected-note@+2 0+{{constant expression}} #pragma omp target #pragma omp teams distribute simd collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) @@ -75,7 +70,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+5 2 {{integral constant expression}} + // expected-error@+5 2 {{integral constant expression}} expected-note@+5 0+{{constant expression}} #else // expected-error@+3 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -126,20 +121,14 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp teams distribute simd', but found only 1}} -#if __cplusplus >= 201103L - // expected-note@+3 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif #pragma omp target -#pragma omp teams distribute simd collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} +#pragma omp teams distribute simd collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -// expected-error@+7 {{integral constant expression}} -// expected-error@+6 2 {{directive '#pragma omp teams distribute simd' cannot contain more than one 'collapse' clause}} -// expected-error@+5 {{argument to 'collapse' clause must be a strictly positive integer value}} -#if __cplusplus >= 201103L -// expected-note@+3 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif +// expected-error@+4 {{integral constant expression}} expected-note@+4 0+{{constant expression}} +// expected-error@+3 2 {{directive '#pragma omp teams distribute simd' cannot contain more than one 'collapse' clause}} +// expected-error@+2 {{argument to 'collapse' clause must be a strictly positive integer value}} #pragma omp target #pragma omp teams distribute simd collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = 4; i < 12; i++) @@ -153,7 +142,7 @@ int main(int argc, char **argv) { #if __cplusplus >= 201103L // expected-error@+5 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #else - // expected-error@+3 {{integral constant expression}} + // expected-error@+3 {{integral constant expression}} expected-note@+3 0+{{constant expression}} #endif #pragma omp target #pragma omp teams distribute simd collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} diff --git a/clang/test/OpenMP/teams_distribute_simd_safelen_messages.cpp b/clang/test/OpenMP/teams_distribute_simd_safelen_messages.cpp index fe83ffd..4efede2 100644 --- a/clang/test/OpenMP/teams_distribute_simd_safelen_messages.cpp +++ b/clang/test/OpenMP/teams_distribute_simd_safelen_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target #pragma omp teams distribute simd safelen // expected-error {{expected '(' after 'safelen'}} @@ -36,7 +35,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target -#pragma omp teams distribute simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-error {{expected ')'}} +#pragma omp teams distribute simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-note 0+{{constant expression}} expected-error {{expected ')'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -55,13 +54,10 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -#if __cplusplus >= 201103L - // expected-note@+6 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif #pragma omp target // expected-error@+3 2 {{directive '#pragma omp teams distribute simd' cannot contain more than one 'safelen' clause}} // expected-error@+2 {{argument to 'safelen' clause must be a strictly positive integer value}} -// expected-error@+1 2 {{integral constant expression}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp teams distribute simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -72,7 +68,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+5 2 {{integral constant expression}} + // expected-error@+5 2 {{integral constant expression}} expected-note@+5 0+{{constant expression}} #else // expected-error@+3 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -120,21 +116,16 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+3 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + #pragma omp target -#pragma omp teams distribute simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} +#pragma omp teams distribute simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+6 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif #pragma omp target // expected-error@+3 {{argument to 'safelen' clause must be a strictly positive integer value}} // expected-error@+2 2 {{directive '#pragma omp teams distribute simd' cannot contain more than one 'safelen' clause}} -// expected-error@+1 {{integral constant expression}} +// expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp teams distribute simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; @@ -145,7 +136,7 @@ int main(int argc, char **argv) { argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+5 {{integral constant expression}} + // expected-error@+5 {{integral constant expression}} expected-note@+5 0+{{constant expression}} #else // expected-error@+3 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif diff --git a/clang/test/OpenMP/teams_distribute_simd_simdlen_messages.cpp b/clang/test/OpenMP/teams_distribute_simd_simdlen_messages.cpp index fe83ffd..4efede2 100644 --- a/clang/test/OpenMP/teams_distribute_simd_simdlen_messages.cpp +++ b/clang/test/OpenMP/teams_distribute_simd_simdlen_messages.cpp @@ -6,20 +6,19 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++98 %s -Wuninitialized // RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 %s -Wuninitialized +// expected-note@* 0+{{declared here}} + void foo() { } -#if __cplusplus >= 201103L -// expected-note@+2 4 {{declared here}} -#endif bool foobool(int argc) { return argc; } -struct S1; // expected-note {{declared here}} +struct S1; -template // expected-note {{declared here}} -T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +template +T tmain(T argc, S **argv) { #pragma omp target #pragma omp teams distribute simd safelen // expected-error {{expected '(' after 'safelen'}} @@ -36,7 +35,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; #pragma omp target -#pragma omp teams distribute simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-error {{expected ')'}} +#pragma omp teams distribute simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-note 0+{{constant expression}} expected-error {{expected ')'}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -55,13 +54,10 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -#if __cplusplus >= 201103L - // expected-note@+6 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif #pragma omp target // expected-error@+3 2 {{directive '#pragma omp teams distribute simd' cannot contain more than one 'safelen' clause}} // expected-error@+2 {{argument to 'safelen' clause must be a strictly positive integer value}} -// expected-error@+1 2 {{integral constant expression}} +// expected-error@+1 2 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp teams distribute simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; @@ -72,7 +68,7 @@ T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} argv[0][i] = argv[0][i] - argv[0][i-ST]; #if __cplusplus <= 199711L - // expected-error@+5 2 {{integral constant expression}} + // expected-error@+5 2 {{integral constant expression}} expected-note@+5 0+{{constant expression}} #else // expected-error@+3 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif @@ -120,21 +116,16 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+3 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif + #pragma omp target -#pragma omp teams distribute simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} +#pragma omp teams distribute simd safelen (foobool(1) > 0 ? 1 : 2) // expected-error {{integral constant expression}} expected-note 0+{{constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -#if __cplusplus >= 201103L - // expected-note@+6 {{non-constexpr function 'foobool' cannot be used in a constant expression}} -#endif #pragma omp target // expected-error@+3 {{argument to 'safelen' clause must be a strictly positive integer value}} // expected-error@+2 2 {{directive '#pragma omp teams distribute simd' cannot contain more than one 'safelen' clause}} -// expected-error@+1 {{integral constant expression}} +// expected-error@+1 {{integral constant expression}} expected-note@+1 0+{{constant expression}} #pragma omp teams distribute simd safelen (foobool(argc)), safelen (true), safelen (-5) for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; @@ -145,7 +136,7 @@ int main(int argc, char **argv) { argv[0][i] = argv[0][i] - argv[0][i-4]; #if __cplusplus <= 199711L - // expected-error@+5 {{integral constant expression}} + // expected-error@+5 {{integral constant expression}} expected-note@+5 0+{{constant expression}} #else // expected-error@+3 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} #endif