Fix MSVC issues (#1261)

For some reasons CI is acting up parsing some macoss specific XFAILs

We do not support that, so just remove them

Fix an issue with MSVC not being able to call `construct_at` on a const qualified type

Addresses nvbug3843240

libcudacxx/include/cuda/std/detail/libcxx/include/__type_traits/is_callable.h

@@ -27,7 +27,7 @@
 
 _LIBCUDACXX_BEGIN_NAMESPACE_STD
 
-template<class _Func, class... _Args, class = decltype(std::declval<_Func>()(std::declval<_Args>()...))>
+template<class _Func, class... _Args, class = decltype(_CUDA_VSTD::declval<_Func>()(_CUDA_VSTD::declval<_Args>()...))>
 _LIBCUDACXX_INLINE_VISIBILITY true_type __is_callable_helper(int);
 template<class...>
 _LIBCUDACXX_INLINE_VISIBILITY false_type __is_callable_helper(...);

libcudacxx/include/cuda/std/detail/libcxx/include/optional

@@ -184,6 +184,7 @@ template<class T>
 #include "__type_traits/is_trivially_move_constructible.h"
 #include "__type_traits/is_object.h"
 #include "__type_traits/negation.h"
+#include "__type_traits/remove_cv.h"
 #include "__utility/declval.h"
 #include "__utility/forward.h"
 #include "__utility/in_place.h"
@@ -266,7 +267,7 @@ struct __optional_destruct_base<_Tp, false>
     union
     {
         char __null_state_;
-        value_type __val_;
+        __remove_cv_t<value_type> __val_;
     };
     bool __engaged_;
 
@@ -313,7 +314,7 @@ struct __optional_destruct_base<_Tp, true>
     union
     {
         char __null_state_;
-        value_type __val_;
+        __remove_cv_t<value_type> __val_;
     };
     bool __engaged_;
 

libcudacxx/test/libcudacxx/libcxx/iterators/bounded_iter/dereference.pass.cpp

@@ -14,7 +14,6 @@
 
 // REQUIRES: has-unix-headers
 // UNSUPPORTED: c++03
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx{{10.9|10.10|10.11|10.12|10.13|10.14|10.15|11.0|12.0}}
 // ADDITIONAL_COMPILE_FLAGS: -D_LIBCUDACXX_ENABLE_ASSERTIONS=1
 
 #include <cuda/std/iterator>

libcudacxx/test/libcudacxx/std/iterators/iterator.primitives/iterator.traits/cxx20_iterator_traits.compile.pass.cpp

@@ -9,9 +9,6 @@
 
 // UNSUPPORTED: c++03, c++11, c++14
 
-// This test uses iterator types from cuda::std::filesystem, which were introduced in macOS 10.15.
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}}
-
 // template<class T>
 // struct iterator_traits;
 

libcudacxx/test/libcudacxx/std/utilities/optional/optional.monadic/and_then.pass.cpp

@@ -9,9 +9,6 @@
 
 // UNSUPPORTED: c++03, c++11
 
-// Throwing bad_optional_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/optional>
 
 // template<class F> constexpr auto and_then(F&&) &;

libcudacxx/test/libcudacxx/std/utilities/optional/optional.monadic/transform.pass.cpp

@@ -9,9 +9,6 @@
 
 // UNSUPPORTED: c++03, c++11
 
-// Throwing bad_optional_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/optional>
 
 // template<class F> constexpr auto transform(F&&) &;

libcudacxx/test/libcudacxx/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp

@@ -9,9 +9,6 @@
 //
 // UNSUPPORTED: c++03, c++11
 
-// Throwing bad_optional_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/optional>
 
 // template <class U>

libcudacxx/test/libcudacxx/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp

@@ -9,9 +9,6 @@
 //
 // UNSUPPORTED: c++03, c++11
 
-// Throwing bad_optional_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/optional>
 
 // constexpr optional(const T& v);

libcudacxx/test/libcudacxx/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp

@@ -9,9 +9,6 @@
 
 // UNSUPPORTED: c++03, c++11
 
-// Throwing bad_optional_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/optional>
 
 // constexpr optional(optional<T>&& rhs);

libcudacxx/test/libcudacxx/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp

@@ -9,9 +9,6 @@
 //
 // UNSUPPORTED: c++03, c++11
 
-// Throwing bad_optional_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/optional>
 
 // constexpr optional(T&& v);

libcudacxx/test/libcudacxx/std/utilities/optional/optional.object/optional.object.observe/value.pass.cpp

@@ -9,9 +9,6 @@
 
 // UNSUPPORTED: c++03, c++11
 
-// Throwing bad_optional_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/optional>
 
 // constexpr T& optional<T>::value() &;

libcudacxx/test/libcudacxx/std/utilities/optional/optional.object/optional.object.observe/value_const.pass.cpp

@@ -9,9 +9,6 @@
 
 // UNSUPPORTED: c++03, c++11
 
-// Throwing bad_optional_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/optional>
 
 // constexpr const T& optional<T>::value() const &;

libcudacxx/test/libcudacxx/std/utilities/optional/optional.object/optional.object.observe/value_const_rvalue.pass.cpp

@@ -9,9 +9,6 @@
 
 // UNSUPPORTED: c++03, c++11
 
-// Throwing bad_optional_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/optional>
 
 // constexpr const T& optional<T>::value() const &&;

libcudacxx/test/libcudacxx/std/utilities/optional/optional.object/optional.object.observe/value_rvalue.pass.cpp

@@ -10,9 +10,6 @@
 // UNSUPPORTED: c++03, c++11
 // <cuda/std/optional>
 
-// Throwing bad_optional_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // constexpr T& optional<T>::value() &&;
 
 #include <cuda/std/optional>

libcudacxx/test/libcudacxx/std/utilities/optional/optional.specalg/make_optional.pass.cpp

@@ -9,9 +9,6 @@
 
 // UNSUPPORTED: c++03, c++11
 
-// Throwing bad_optional_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/optional>
 //
 // template <class T>

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

@@ -10,9 +10,6 @@
 // UNSUPPORTED: msvc-19.16
 // UNSUPPORTED: true
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}}
-
 // <cuda/std/variant>
 
 /*

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

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 
 // template <size_t I, class... Types>

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

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 
 // template <class T, class... Types> constexpr T& get(variant<Types...>& v);

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

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 
 // template <class ...Types> class variant;

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

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 
 // template <class ...Types> class variant;

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

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 
 // template <class ...Types> class variant;

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

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 
 // template <class ...Types> class variant;

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

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 
 // template <class ...Types> class variant;

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

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 
 // template <class ...Types> class variant;

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

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 
 // template <class ...Types> class variant;

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

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 
 // template <class ...Types> class variant;

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

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 
 // template <class ...Types> class variant;

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

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 
 // template <class ...Types> class variant;

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

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 
 // template <class ...Types> class variant;

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

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 
 // template <class ...Types> class variant;

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

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 
 // template <class ...Types> class variant;

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

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 
 // template <class ...Types> class variant;

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

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 
 // template <class ...Types> class variant;

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

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 
 // template <class ...Types> class variant;

libcudacxx/test/libcudacxx/std/utilities/variant/variant.visit/robust_against_adl.pass.cpp

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 // template <class Visitor, class... Variants>
 // constexpr see below visit(Visitor&& vis, Variants&&... vars);

libcudacxx/test/libcudacxx/std/utilities/variant/variant.visit/visit_argument_forwarding.pass.cpp

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 // template <class Visitor, class... Variants>
 // constexpr see below visit(Visitor&& vis, Variants&&... vars);

libcudacxx/test/libcudacxx/std/utilities/variant/variant.visit/visit_call_operator_forwarding.pass.cpp

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 // template <class Visitor, class... Variants>
 // constexpr see below visit(Visitor&& vis, Variants&&... vars);

libcudacxx/test/libcudacxx/std/utilities/variant/variant.visit/visit_caller_nonconst.pass.cpp

@@ -9,9 +9,6 @@
 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: msvc-19.16
 
-// Throwing bad_variant_access is supported starting in macosx10.13
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions
-
 // <cuda/std/variant>
 // template <class Visitor, class... Variants>
 // constexpr see below visit(Visitor&& vis, Variants&&... vars);