Make optional compile with old clang and nvcc

NVIDIA · Jun 27, 2023 · b92504b · b92504b
1 parent 8c0fff9
commit b92504b
Show file tree

Hide file tree

Showing 49 changed files with 310 additions and 155 deletions.
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp
@@ -39,9 +39,9 @@ constexpr bool test() {
     typedef optional<T> O;
 
     constexpr T val(2);
-    constexpr O o1;      // disengaged
-    constexpr O o2{1};   // engaged
-    constexpr O o3{val}; // engaged
+    O o1;      // disengaged
+    O o2{1};   // engaged
+    O o3{val}; // engaged
 
     assert(!(o1 == T(1)));
     assert((o2 == T(1)));
@@ -57,13 +57,13 @@ constexpr bool test() {
   }
   {
     using O = optional<int>;
-    constexpr O o1(42);
+    O o1(42);
     assert(o1 == 42l);
     assert(!(101l == o1));
   }
   {
     using O = optional<const int>;
-    constexpr O o1(42);
+    O o1(42);
     assert(o1 == 42);
     assert(!(101 == o1));
   }
@@ -74,7 +74,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
+#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
   static_assert(test());
+#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;

diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp
@@ -37,9 +37,9 @@ constexpr bool test() {
     typedef optional<T> O;
 
     constexpr T val(2);
-    constexpr O o1;      // disengaged
-    constexpr O o2{1};   // engaged
-    constexpr O o3{val}; // engaged
+    O o1;      // disengaged
+    O o2{1};   // engaged
+    O o3{val}; // engaged
 
     assert(!(o1 > T(1)));
     assert(!(o2 > T(1))); // equal
@@ -57,13 +57,13 @@ constexpr bool test() {
   }
   {
     using O = optional<int>;
-    constexpr O o1(42);
+    O o1(42);
     assert(o1 > 11l);
     assert(!(42l > o1));
   }
   {
     using O = optional<const int>;
-    constexpr O o1(42);
+    O o1(42);
     assert(o1 > 11);
     assert(!(42 > o1));
   }
@@ -74,7 +74,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
+#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
   static_assert(test());
+#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;

diff --git a/...x/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp b/...x/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp
@@ -39,9 +39,9 @@ constexpr bool test() {
     typedef optional<T> O;
 
     constexpr T val(2);
-    constexpr O o1;      // disengaged
-    constexpr O o2{1};   // engaged
-    constexpr O o3{val}; // engaged
+    O o1;      // disengaged
+    O o2{1};   // engaged
+    O o3{val}; // engaged
 
     assert(!(o1 >= T(1)));
     assert((o2 >= T(1))); // equal
@@ -59,13 +59,13 @@ constexpr bool test() {
   }
   {
     using O = optional<int>;
-    constexpr O o1(42);
+    O o1(42);
     assert(o1 >= 42l);
     assert(!(11l >= o1));
   }
   {
     using O = optional<const int>;
-    constexpr O o1(42);
+    O o1(42);
     assert(o1 >= 42);
     assert(!(11 >= o1));
   }
@@ -76,7 +76,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
+#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
   static_assert(test());
+#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;

diff --git a/...acxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp b/...acxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp
@@ -39,9 +39,9 @@ constexpr bool test() {
     typedef optional<T> O;
 
     constexpr T val(2);
-    constexpr O o1;      // disengaged
-    constexpr O o2{1};   // engaged
-    constexpr O o3{val}; // engaged
+    O o1;      // disengaged
+    O o2{1};   // engaged
+    O o3{val}; // engaged
 
     assert((o1 <= T(1)));
     assert((o2 <= T(1))); // equal
@@ -59,13 +59,13 @@ constexpr bool test() {
   }
   {
     using O = optional<int>;
-    constexpr O o1(42);
+    O o1(42);
     assert(o1 <= 42l);
     assert(!(101l <= o1));
   }
   {
     using O = optional<const int>;
-    constexpr O o1(42);
+    O o1(42);
     assert(o1 <= 42);
     assert(!(101 <= o1));
   }
@@ -76,7 +76,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
+#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
   static_assert(test());
+#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;

diff --git a/...dacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp b/...dacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp
@@ -37,9 +37,9 @@ constexpr bool test() {
     typedef optional<T> O;
 
     constexpr T val(2);
-    constexpr O o1;      // disengaged
-    constexpr O o2{1};   // engaged
-    constexpr O o3{val}; // engaged
+    O o1;      // disengaged
+    O o2{1};   // engaged
+    O o3{val}; // engaged
 
     assert((o1 < T(1)));
     assert(!(o2 < T(1))); // equal
@@ -57,13 +57,13 @@ constexpr bool test() {
   }
   {
     using O = optional<int>;
-    constexpr O o1(42);
+    O o1(42);
     assert(o1 < 101l);
     assert(!(42l < o1));
   }
   {
     using O = optional<const int>;
-    constexpr O o1(42);
+    O o1(42);
     assert(o1 < 101);
     assert(!(42 < o1));
   }
@@ -74,7 +74,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
+#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
   static_assert(test());
+#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;

diff --git a/...dacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp b/...dacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp
@@ -39,9 +39,9 @@ constexpr bool test() {
     typedef optional<T> O;
 
     constexpr T val(2);
-    constexpr O o1;      // disengaged
-    constexpr O o2{1};   // engaged
-    constexpr O o3{val}; // engaged
+    O o1;      // disengaged
+    O o2{1};   // engaged
+    O o3{val}; // engaged
 
     assert((o1 != T(1)));
     assert(!(o2 != T(1)));
@@ -57,13 +57,13 @@ constexpr bool test() {
   }
   {
     using O = optional<int>;
-    constexpr O o1(42);
+    O o1(42);
     assert(o1 != 101l);
     assert(!(42l != o1));
   }
   {
     using O = optional<const int>;
-    constexpr O o1(42);
+    O o1(42);
     assert(o1 != 101);
     assert(!(42 != o1));
   }
@@ -74,7 +74,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
+#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
   static_assert(test());
+#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;

diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.monadic/or_else.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.monadic/or_else.pass.cpp
@@ -128,14 +128,16 @@ TEST_CONSTEXPR_CXX17 bool test_nontrivial() {
 int main(int, char**) {
   test();
   test_nontrivial();
+#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
   // GCC <9 incorrectly trips on the assertions in this, so disable it there
 #if TEST_STD_VER > 14 && (!defined(TEST_COMPILER_GCC) || __GNUC__ < 9)
   static_assert(test(), "");
-#endif
+#endif // TEST_STD_VER > 14 && (!defined(TEST_COMPILER_GCC) || __GNUC__ < 9)
 #if TEST_STD_VER > 17
 #if defined(_LIBCUDACXX_ADDRESSOF)
   static_assert(test_nontrivial());
-#endif
-#endif
+#endif // defined(_LIBCUDACXX_ADDRESSOF)
+#endif // TEST_STD_VER > 17
+#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
   return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/equal.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/equal.pass.cpp
@@ -28,8 +28,8 @@ constexpr bool test() {
     typedef int T;
     typedef optional<T> O;
 
-    constexpr O o1;     // disengaged
-    constexpr O o2{1};  // engaged
+    O o1;     // disengaged
+    O o2{1};  // engaged
 
     assert( (nullopt == o1));
     assert(!(nullopt == o2));
@@ -46,7 +46,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
+#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
   static_assert(test());
+#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;

diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/greater.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/greater.pass.cpp
@@ -28,8 +28,8 @@ constexpr bool test() {
     typedef int T;
     typedef optional<T> O;
 
-    constexpr O o1;     // disengaged
-    constexpr O o2{1};  // engaged
+    O o1;     // disengaged
+    O o2{1};  // engaged
 
     assert(!(nullopt > o1));
     assert(!(nullopt > o2));
@@ -46,7 +46,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
+#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
   static_assert(test());
+#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;

diff --git a/...dacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/greater_equal.pass.cpp b/...dacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/greater_equal.pass.cpp
@@ -28,8 +28,8 @@ constexpr bool test() {
     typedef int T;
     typedef optional<T> O;
 
-    constexpr O o1;     // disengaged
-    constexpr O o2{1};  // engaged
+    O o1;     // disengaged
+    O o2{1};  // engaged
 
     assert( (nullopt >= o1));
     assert(!(nullopt >= o2));
@@ -46,7 +46,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
+#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
   static_assert(test());
+#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;

diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/less_equal.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/less_equal.pass.cpp
@@ -29,8 +29,8 @@ constexpr bool test() {
     typedef int T;
     typedef optional<T> O;
 
-    constexpr O o1;     // disengaged
-    constexpr O o2{1};  // engaged
+    O o1;     // disengaged
+    O o2{1};  // engaged
 
     assert( (nullopt <= o1));
     assert( (nullopt <= o2));
@@ -47,7 +47,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
+#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
   static_assert(test());
+#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;

diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/less_than.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/less_than.pass.cpp
@@ -28,8 +28,8 @@ constexpr bool test() {
     typedef int T;
     typedef optional<T> O;
 
-    constexpr O o1;     // disengaged
-    constexpr O o2{1};  // engaged
+    O o1;     // disengaged
+    O o2{1};  // engaged
 
     assert(!(nullopt < o1));
     assert( (nullopt < o2));
@@ -46,7 +46,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
+#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
   static_assert(test());
+#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;

diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/not_equal.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/not_equal.pass.cpp
@@ -28,8 +28,8 @@ constexpr bool test() {
     typedef int T;
     typedef optional<T> O;
 
-    constexpr O o1;     // disengaged
-    constexpr O o2{1};  // engaged
+    O o1;     // disengaged
+    O o2{1};  // engaged
 
     assert(!(nullopt != o1));
     assert( (nullopt != o2));
@@ -46,7 +46,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
+#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
   static_assert(test());
+#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;

diff --git a/.../test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp b/.../test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp
@@ -315,7 +315,9 @@ int main(int, char**)
     test_throws();
 
 #if !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
+#if !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
     static_assert(pr38638(3) == 5, "");
+#endif // !(defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000 && defined(TEST_COMPILER_CLANG))
 #endif // !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
 
   return 0;