[PATCH] D27488: Fixing test to work when the compiler defaults to a different c++ standard version.

[Douglas Yung via Phabricator via cfe-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL289075: Fixing test to work when the compiler defaults to a 
different C++ standard… (authored by dyung).

Changed prior to commit:
  https://reviews.llvm.org/D27488?vs=80496=80776#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D27488

Files:
  cfe/trunk/test/OpenMP/teams_distribute_simd_collapse_messages.cpp


Index: cfe/trunk/test/OpenMP/teams_distribute_simd_collapse_messages.cpp
===
--- cfe/trunk/test/OpenMP/teams_distribute_simd_collapse_messages.cpp
+++ cfe/trunk/test/OpenMP/teams_distribute_simd_collapse_messages.cpp
@@ -1,8 +1,13 @@
 // RUN: %clang_cc1 -verify -fopenmp %s
+// RUN: %clang_cc1 -verify -fopenmp -std=c++98 %s
+// RUN: %clang_cc1 -verify -fopenmp -std=c++11 %s
 
 void foo() {
 }
 
+#if __cplusplus >= 201103L
+// expected-note@+2 4 {{declared here}}
+#endif
 bool foobool(int argc) {
   return argc;
 }
@@ -50,9 +55,12 @@
   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@+4 2 {{directive '#pragma omp teams distribute simd' cannot 
contain more than one 'collapse' clause}}
-// expected-error@+3 2 {{argument to 'collapse' clause must be a strictly 
positive integer value}}
-// expected-error@+2 2 {{expression is not an integral constant expression}}
+// expected-error@+7 2 {{directive '#pragma omp teams distribute simd' cannot 
contain more than one 'collapse' clause}}
+// expected-error@+6 2 {{argument to 'collapse' clause must be a strictly 
positive integer value}}
+// expected-error@+5 2 {{expression is not an integral constant expression}}
+#if __cplusplus >= 201103L
+// expected-note@+3 2 {{non-constexpr function 'foobool' cannot be used in a 
constant expression}}
+#endif
 #pragma omp target
 #pragma omp teams distribute simd collapse (foobool(argc)), collapse (true), 
collapse (-5)
   for (int i = ST; i < N; i++)
@@ -62,7 +70,11 @@
   for (int i = ST; i < N; i++)
 argv[0][i] = argv[0][i] - argv[0][i-ST];
 
-// expected-error@+2 2 {{expression is not an integral constant expression}}
+#if __cplusplus <= 199711L
+  // expected-error@+5 2 {{expression is not an integral constant expression}}
+#else
+  // expected-error@+3 2 {{integral constant expression must have integral or 
unscoped enumeration type, not 'char *'}}
+#endif
 #pragma omp target
 #pragma omp teams distribute simd collapse (argv[1]=2) // expected-error 
{{expected ')'}} expected-note {{to match this '('}}
   for (int i = ST; i < N; i++)
@@ -110,14 +122,20 @@
   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 {{expression is not an integral constant expression}}
   for (int i = 4; i < 12; i++)
 argv[0][i] = argv[0][i] - argv[0][i-4];
 
-// expected-error@+4 {{expression is not an integral constant expression}}
-// expected-error@+3 2 {{directive '#pragma omp teams distribute simd' cannot 
contain more than one 'collapse' clause}}
-// expected-error@+2 2 {{argument to 'collapse' clause must be a strictly 
positive integer value}}
+// expected-error@+7 {{expression is not an integral constant expression}}
+// expected-error@+6 2 {{directive '#pragma omp teams distribute simd' cannot 
contain more than one 'collapse' clause}}
+// expected-error@+5 2 {{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
 #pragma omp target
 #pragma omp teams distribute simd collapse (foobool(argc)), collapse (true), 
collapse (-5) 
   for (int i = 4; i < 12; i++)
@@ -128,7 +146,11 @@
   for (int i = 4; i < 12; i++)
 argv[0][i] = argv[0][i] - argv[0][i-4];
 
-// expected-error@+2 {{expression is not an integral constant expression}}
+#if __cplusplus >= 201103L
+  // expected-error@+5 {{integral constant expression must have integral or 
unscoped enumeration type, not 'char *'}}
+#else
+  // expected-error@+3 {{expression is not an integral constant expression}}
+#endif
 #pragma omp target
 #pragma omp teams distribute simd collapse (argv[1]=2) // expected-error 
{{expected ')'}} expected-note {{to match this '('}}
   for (int i = 4; i < 12; i++)


Index: cfe/trunk/test/OpenMP/teams_distribute_simd_collapse_messages.cpp
===
--- cfe/trunk/test/OpenMP/teams_distribute_simd_collapse_messages.cpp
+++ 

[PATCH] D27488: Fixing test to work when the compiler defaults to a different c++ standard version.

[Alexey Bataev via Phabricator via cfe-commits]

ABataev accepted this revision.
ABataev added a comment.
This revision is now accepted and ready to land.

LG


https://reviews.llvm.org/D27488



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D27488: Fixing test to work when the compiler defaults to a different c++ standard version.

[Kelvin Li via Phabricator via cfe-commits]

kkwli0 added a comment.

I am okay with the changes.  Thanks.  Alexey will have the final say.


https://reviews.llvm.org/D27488



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D27488: Fixing test to work when the compiler defaults to a different c++ standard version.

[Douglas Yung via Phabricator via cfe-commits]

dyung created this revision.
dyung added a reviewer: kkwli0.
dyung added a subscriber: cfe-commits.

This test as originally written fails when run with a compiler that defaults to 
a different C++ standard. This patch fixes up the test and adds testing it 
explicitly using c++98 and c++11. The changes were adapted from similar work 
done in distribute_parallel_for_simd_collapse_messages.cpp.


https://reviews.llvm.org/D27488

Files:
  teams_distribute_simd_collapse_messages.cpp


Index: teams_distribute_simd_collapse_messages.cpp
===
--- teams_distribute_simd_collapse_messages.cpp
+++ teams_distribute_simd_collapse_messages.cpp
@@ -1,8 +1,13 @@
 // RUN: %clang_cc1 -verify -fopenmp %s
+// RUN: %clang_cc1 -verify -fopenmp -std=c++98 %s
+// RUN: %clang_cc1 -verify -fopenmp -std=c++11 %s
 
 void foo() {
 }
 
+#if __cplusplus >= 201103L
+// expected-note@+2 4 {{declared here}}
+#endif
 bool foobool(int argc) {
   return argc;
 }
@@ -50,9 +55,12 @@
   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@+4 2 {{directive '#pragma omp teams distribute simd' cannot 
contain more than one 'collapse' clause}}
-// expected-error@+3 2 {{argument to 'collapse' clause must be a strictly 
positive integer value}}
-// expected-error@+2 2 {{expression is not an integral constant expression}}
+// expected-error@+7 2 {{directive '#pragma omp teams distribute simd' cannot 
contain more than one 'collapse' clause}}
+// expected-error@+6 2 {{argument to 'collapse' clause must be a strictly 
positive integer value}}
+// expected-error@+5 2 {{expression is not an integral constant expression}}
+#if __cplusplus >= 201103L
+// expected-note@+3 2 {{non-constexpr function 'foobool' cannot be used in a 
constant expression}}
+#endif
 #pragma omp target
 #pragma omp teams distribute simd collapse (foobool(argc)), collapse (true), 
collapse (-5)
   for (int i = ST; i < N; i++)
@@ -62,7 +70,11 @@
   for (int i = ST; i < N; i++)
 argv[0][i] = argv[0][i] - argv[0][i-ST];
 
-// expected-error@+2 2 {{expression is not an integral constant expression}}
+#if __cplusplus <= 199711L
+  // expected-error@+5 2 {{expression is not an integral constant expression}}
+#else
+  // expected-error@+3 2 {{integral constant expression must have integral or 
unscoped enumeration type, not 'char *'}}
+#endif
 #pragma omp target
 #pragma omp teams distribute simd collapse (argv[1]=2) // expected-error 
{{expected ')'}} expected-note {{to match this '('}}
   for (int i = ST; i < N; i++)
@@ -110,14 +122,20 @@
   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 {{expression is not an integral constant expression}}
   for (int i = 4; i < 12; i++)
 argv[0][i] = argv[0][i] - argv[0][i-4];
 
-// expected-error@+4 {{expression is not an integral constant expression}}
-// expected-error@+3 2 {{directive '#pragma omp teams distribute simd' cannot 
contain more than one 'collapse' clause}}
-// expected-error@+2 2 {{argument to 'collapse' clause must be a strictly 
positive integer value}}
+// expected-error@+7 {{expression is not an integral constant expression}}
+// expected-error@+6 2 {{directive '#pragma omp teams distribute simd' cannot 
contain more than one 'collapse' clause}}
+// expected-error@+5 2 {{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
 #pragma omp target
 #pragma omp teams distribute simd collapse (foobool(argc)), collapse (true), 
collapse (-5) 
   for (int i = 4; i < 12; i++)
@@ -128,7 +146,11 @@
   for (int i = 4; i < 12; i++)
 argv[0][i] = argv[0][i] - argv[0][i-4];
 
-// expected-error@+2 {{expression is not an integral constant expression}}
+#if __cplusplus >= 201103L
+  // expected-error@+5 {{integral constant expression must have integral or 
unscoped enumeration type, not 'char *'}}
+#else
+  // expected-error@+3 {{expression is not an integral constant expression}}
+#endif
 #pragma omp target
 #pragma omp teams distribute simd collapse (argv[1]=2) // expected-error 
{{expected ')'}} expected-note {{to match this '('}}
   for (int i = 4; i < 12; i++)


Index: teams_distribute_simd_collapse_messages.cpp
===
--- teams_distribute_simd_collapse_messages.cpp
+++ teams_distribute_simd_collapse_messages.cpp
@@ -1,8 +1,13 @@
 // RUN: