Address various issues from internal CI (#1462)

* We should not use `_LIBCUDACXX_NODEBUG` because that is broken on nvcc

Instead we need to disable that through `_LIBCUDACXX_NODEBUG_TYPE`

Addresses nvbug4535115

* For now disable variant for clang-{7,8}

Fixes nvbug4535115

* Address subsumption fix from 12.5

Fixes nvbug4535115

libcudacxx/include/cuda/std/detail/libcxx/include/__utility/exception_guard.h

@@ -104,10 +104,10 @@ _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(__exception_guard_exceptions);
 template <class _Rollback>
 struct __exception_guard_noexceptions {
   __exception_guard_noexceptions() = delete;
-  _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX17 _LIBCUDACXX_NODEBUG
+  _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX17 _LIBCUDACXX_NODEBUG_TYPE
   explicit __exception_guard_noexceptions(_Rollback) {}
 
-  _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX17 _LIBCUDACXX_NODEBUG
+  _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX17 _LIBCUDACXX_NODEBUG_TYPE
   __exception_guard_noexceptions(__exception_guard_noexceptions&& __other)
       noexcept(_LIBCUDACXX_TRAIT(is_nothrow_move_constructible, _Rollback))
       : __completed_(__other.__completed_) {
@@ -118,12 +118,12 @@ struct __exception_guard_noexceptions {
   __exception_guard_noexceptions& operator=(__exception_guard_noexceptions const&) = delete;
   __exception_guard_noexceptions& operator=(__exception_guard_noexceptions&&)      = delete;
 
-  _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX17 _LIBCUDACXX_NODEBUG
+  _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX17 _LIBCUDACXX_NODEBUG_TYPE
   void __complete() noexcept {
     __completed_ = true;
   }
 
-  _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX17 _LIBCUDACXX_NODEBUG
+  _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX17 _LIBCUDACXX_NODEBUG_TYPE
   ~__exception_guard_noexceptions() {
     _LIBCUDACXX_ASSERT(__completed_, "__exception_guard not completed with exceptions disabled");
   }

libcudacxx/include/cuda/std/detail/libcxx/include/variant

@@ -1386,11 +1386,11 @@ struct __narrowing_check
   };
 
   template <class _Dest, class _Source>
-  using _Apply _LIBCUDACXX_NODEBUG = typename __narrowing_check_impl<_Dest, _Source>::type;
+  using _Apply _LIBCUDACXX_NODEBUG_TYPE = typename __narrowing_check_impl<_Dest, _Source>::type;
 };
 
 template <class _Dest, class _Source>
-using __check_for_narrowing _LIBCUDACXX_NODEBUG = typename _If<
+using __check_for_narrowing _LIBCUDACXX_NODEBUG_TYPE = typename _If<
 #  ifdef _LIBCUDACXX_ENABLE_NARROWING_CONVERSIONS_IN_VARIANT
   false &&
 #  endif
@@ -1460,11 +1460,11 @@ template <size_t... _Idx>
 struct __make_overloads_imp<__tuple_indices<_Idx...>>
 {
   template <class... _Types>
-  using _Apply _LIBCUDACXX_NODEBUG = __all_overloads<__overload<_Types, _Idx>...>;
+  using _Apply _LIBCUDACXX_NODEBUG_TYPE = __all_overloads<__overload<_Types, _Idx>...>;
 };
 
 template <class... _Types>
-using _MakeOverloads _LIBCUDACXX_NODEBUG =
+using _MakeOverloads _LIBCUDACXX_NODEBUG_TYPE =
   typename __make_overloads_imp<__make_indices_imp<sizeof...(_Types), 0>>::template _Apply<_Types...>;
 
 template <class _Tp, class... _Types>

libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/alg.req.ind.copy/indirectly_copyable.subsumption.compile.pass.cpp

@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++03, c++11, c++14, c++17
-// XFAIL: c++20 && (nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3)
+// XFAIL: nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3
 // nvbug 3885350
 
 // template<class In, class Out>

libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/alg.req.ind.move/indirectly_movable.subsumption.compile.pass.cpp

@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++03, c++11, c++14, c++17
-// XFAIL: c++20 && (nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3)
+// XFAIL: nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3
 // nvbug 3885350
 
 // template<class In, class Out>

libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.bidir/subsumption.compile.pass.cpp

@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++03, c++11, c++14, c++17
-// XFAIL: c++20 && (nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3)
+// XFAIL: nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3
 // nvbug 3885350
 
 // template<class T>

libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.forward/subsumption.compile.pass.cpp

@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++03, c++11, c++14, c++17
-// XFAIL: c++20 && (nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3)
+// XFAIL: nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3
 // nvbug 3885350
 
 // cuda::std::forward_iterator;

libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.inc/subsumption.compile.pass.cpp

@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++03, c++11, c++14, c++17
-// XFAIL: c++20 && (nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3)
+// XFAIL: nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3
 // nvbug 3885350
 
 // template<class T>

libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.input/subsumption.compile.pass.cpp

@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++03, c++11, c++14, c++17
-// XFAIL: c++20 && (nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3)
+// XFAIL: nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3
 // nvbug 3885350
 
 // template<class T>

libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.iterator/subsumption.compile.pass.cpp

@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++03, c++11, c++14, c++17
-// XFAIL: c++20 && (nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3)
+// XFAIL: nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3
 // nvbug 3885350
 
 // template<class In>

libcudacxx/test/libcudacxx/std/ranges/range.req/range.view/view.subsumption.compile.pass.cpp

@@ -9,7 +9,7 @@
 
 // UNSUPPORTED: c++03, c++11, c++14, c++17
 // UNSUPPORTED: msvc-19.16
-// XFAIL: c++20 && !nvhpc && !(clang && !nvcc)
+// XFAIL: nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3
 // nvbug 3885350
 
 // <ranges>

libcudacxx/test/libcudacxx/std/utilities/variant/variant.bad_variant_access/bad_variant_access.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 // UNSUPPORTED: true
 
 // <cuda/std/variant>

libcudacxx/test/libcudacxx/std/utilities/variant/variant.get/get_if_index.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.get/get_if_type.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.get/get_index.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.get/get_type.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.get/holds_alternative.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.helpers/variant_alternative.fail.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.helpers/variant_alternative.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.helpers/variant_size.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.monostate.relops/relops.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.monostate/monostate.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.relops/relops.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.relops/relops_bool_conv.fail.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.relops/three_way.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11, c++14, c++17
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 // UNSUPPORTED: true
 
 // <cuda/std/variant>

libcudacxx/test/libcudacxx/std/utilities/variant/variant.synopsis/variant_npos.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.variant/implicit_ctad.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11, c++14
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.variant/variant.assign/conv.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.variant/variant.assign/copy.fail.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.variant/variant.ctor/conv.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.variant/variant.dtor/dtor.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>
 

libcudacxx/test/libcudacxx/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
+// UNSUPPORTED: clang-7, clang-8
 
 // <cuda/std/variant>