[BACKPORT]: Properly test internal headers (#1258)

CMakePresets.json

@@ -273,7 +273,12 @@
     {
       "name": "libcudacxx-base",
       "hidden": true,
-      "targets": ["libcudacxx.test.lit.precompile"]
+      "targets": [
+        "libcudacxx.test.internal_headers",
+        "libcudacxx.test.public_headers",
+        "libcudacxx.test.public_headers_host_only",
+        "libcudacxx.test.lit.precompile"
+      ]
     },
     {
       "name": "libcudacxx-nvrtc-cpp11",

libcudacxx/include/cuda/annotated_ptr

@@ -188,6 +188,8 @@ void discard_memory(volatile void* __ptr, std::size_t __nbytes) noexcept {
       asm volatile ("discard.global.L2 [%0], 128;" ::"l"(__p + (__i * _LINE_SIZE)) :);
     }
   ))
+  (void)__ptr;
+  (void)__nbytes;
 }
 
 template<class _Tp, class _Property>

libcudacxx/include/cuda/std/detail/__annotated_ptr

@@ -63,7 +63,9 @@ namespace __detail_ap {
       _LIBCUDACXX_ASSERT(__b, "");
 #if !defined(_LIBCUDACXX_CUDACC_BELOW_11_2)
       __builtin_assume(__b);
-#endif // !defined(_LIBCUDACXX_CUDACC_BELOW_11_2)
+#else // ^^^ !_LIBCUDACXX_CUDACC_BELOW_11_2 ^^^ / vvv _LIBCUDACXX_CUDACC_BELOW_11_2 vvv
+      (void)__b;
+#endif // _LIBCUDACXX_CUDACC_BELOW_11_2
     } else if (std::is_same<_Property, access_property::global>::value == true ||
                std::is_same<_Property, access_property::normal>::value == true ||
                std::is_same<_Property, access_property::persisting>::value == true ||
@@ -73,7 +75,9 @@ namespace __detail_ap {
       _LIBCUDACXX_ASSERT(__b, "");
 #if !defined(_LIBCUDACXX_CUDACC_BELOW_11_2)
       __builtin_assume(__b);
-#endif // !defined(_LIBCUDACXX_CUDACC_BELOW_11_2)
+#else // ^^^ !_LIBCUDACXX_CUDACC_BELOW_11_2 ^^^ / vvv _LIBCUDACXX_CUDACC_BELOW_11_2 vvv
+      (void)__b;
+#endif // _LIBCUDACXX_CUDACC_BELOW_11_2
     }
 
     return __ptr;

libcudacxx/include/cuda/std/detail/libcxx/include/__assert

@@ -51,18 +51,18 @@
 
 #if _LIBCUDACXX_ENABLE_ASSERTIONS
 # define _LIBCUDACXX_ASSERT(expression, message)                                \
-    (_LIBCUDACXX_DIAGNOSTIC_PUSH                                                \
-    _LIBCUDACXX_CLANG_DIAGNOSTIC_IGNORED("-Wassume")                            \
+    (_CCCL_DIAG_PUSH                                                            \
+    _CCCL_DIAG_SUPPRESS_CLANG("-Wassume")                                       \
     __builtin_expect(static_cast<bool>(expression), 1) ?                        \
       (void)0 :                                                                 \
       ::_CUDA_VSTD::__libcpp_verbose_abort("%s:%d: assertion %s failed: %s", __FILE__, __LINE__, #expression, message)
-    _LIBCUDACXX_DIAGNOSTIC_POP)
+    _CCCL_DIAG_POP)
 #elif 0 // !defined(_LIBCUDACXX_ASSERTIONS_DISABLE_ASSUME) && __has_builtin(__builtin_assume)
 # define _LIBCUDACXX_ASSERT(expression, message)                                \
-    (_LIBCUDACXX_DIAGNOSTIC_PUSH                                                \
-    _LIBCUDACXX_CLANG_DIAGNOSTIC_IGNORED("-Wassume")                            \
+    (_CCCL_DIAG_PUSH                                                            \
+    _CCCL_DIAG_SUPPRESS_CLANG("-Wassume")                                       \
     __builtin_assume(static_cast<bool>(expression))                             \
-    _LIBCUDACXX_DIAGNOSTIC_POP)
+    _CCCL_DIAG_POP)
 #else
 # define _LIBCUDACXX_ASSERT(expression, message) ((void)0)
 #endif

libcudacxx/include/cuda/std/detail/libcxx/include/__cccl_config

@@ -50,6 +50,12 @@
 #  define _CCCL_CUDA_COMPILER_CLANG
 #endif
 
+// Shorthand to check whether there is a cuda compiler available
+#if defined(_CCCL_CUDA_COMPILER_NVCC) || defined(_CCCL_CUDA_COMPILER_NVHPC) || defined(_CCCL_CUDA_COMPILER_CLANG) \
+  || defined(_CCCL_COMPILER_NVRTC)
+#  define _CCCL_CUDA_COMPILER
+#endif // cuda compiler available
+
 // Enforce that cccl headers are treated as system headers
 #if defined(_CCCL_COMPILER_GCC) || defined(_CCCL_COMPILER_NVHPC) || defined(_CCCL_COMPILER_ICC) \
   || defined(_CCCL_COMPILER_ICC_LLVM)
@@ -92,24 +98,35 @@
 #  define _CCCL_DIAG_SUPPRESS_CLANG(str) _Pragma(_CCCL_TOSTRING(clang diagnostic ignored str))
 #  define _CCCL_DIAG_SUPPRESS_GCC(str)
 #  define _CCCL_DIAG_SUPPRESS_NVHPC(str)
+#  define _CCCL_DIAG_SUPPRESS_MSVC(str)
 #elif defined(_CCCL_COMPILER_GCC)
 #  define _CCCL_DIAG_PUSH _Pragma("GCC diagnostic push")
 #  define _CCCL_DIAG_POP  _Pragma("GCC diagnostic pop")
 #  define _CCCL_DIAG_SUPPRESS_CLANG(str)
 #  define _CCCL_DIAG_SUPPRESS_GCC(str) _Pragma(_CCCL_TOSTRING(GCC diagnostic ignored str))
 #  define _CCCL_DIAG_SUPPRESS_NVHPC(str)
+#  define _CCCL_DIAG_SUPPRESS_MSVC(str)
 #elif defined(_CCCL_COMPILER_NVHPC)
 #  define _CCCL_DIAG_PUSH _Pragma("diagnostic push")
 #  define _CCCL_DIAG_POP  _Pragma("diagnostic pop")
 #  define _CCCL_DIAG_SUPPRESS_CLANG(str)
 #  define _CCCL_DIAG_SUPPRESS_GCC(str)
-#  define _CCCL_DIAG_SUPPRESS_NVHPC(str) _Pragma(_LIBCUDACXX_TOSTRING(diag_suppress str))
+#  define _CCCL_DIAG_SUPPRESS_NVHPC(str) _Pragma(_CCCL_TOSTRING(diag_suppress str))
+#  define _CCCL_DIAG_SUPPRESS_MSVC(str)
+#elif defined(_CCCL_COMPILER_MSVC)
+#  define _CCCL_DIAG_PUSH __pragma(warning(push))
+#  define _CCCL_DIAG_POP  __pragma(warning(pop))
+#  define _CCCL_DIAG_SUPPRESS_CLANG(str)
+#  define _CCCL_DIAG_SUPPRESS_GCC(str)
+#  define _CCCL_DIAG_SUPPRESS_NVHPC(str)
+#  define _CCCL_DIAG_SUPPRESS_MSVC(str) __pragma(warning(disable : str))
 #else
 #  define _CCCL_DIAG_PUSH
 #  define _CCCL_DIAG_POP
 #  define _CCCL_DIAG_SUPPRESS_CLANG(str)
 #  define _CCCL_DIAG_SUPPRESS_GCC(str)
 #  define _CCCL_DIAG_SUPPRESS_NVHPC(str)
+#  define _CCCL_DIAG_SUPPRESS_MSVC(str)
 #endif
 
 // Convenient shortcuts to silence common warnings
@@ -125,6 +142,11 @@
     _CCCL_DIAG_SUPPRESS_GCC("-Wdeprecated")   \
     _CCCL_DIAG_SUPPRESS_GCC("-Wdeprecated-declarations")
 #  define _CCCL_DIAG_SUPPRESS_DEPRECATED_POP _CCCL_DIAG_POP
+#elif defined(_CCCL_COMPILER_MSVC)
+#  define _CCCL_DIAG_SUPPRESS_DEPRECATED_PUSH \
+    _CCCL_DIAG_PUSH                           \
+    _CCCL_DIAG_SUPPRESS_MSVC(4996)
+#  define _CCCL_DIAG_SUPPRESS_DEPRECATED_POP _CCCL_DIAG_POP
 #else // !_CCCL_COMPILER_CLANG && !_CCCL_COMPILER_GCC
 #  define _CCCL_DIAG_SUPPRESS_DEPRECATED_PUSH
 #  define _CCCL_DIAG_SUPPRESS_DEPRECATED_POP

libcudacxx/include/cuda/std/detail/libcxx/include/__config

@@ -415,7 +415,7 @@ extern "C++" {
 #  define _LIBCUDACXX_NO_CFI
 #endif
 
-#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L
+#if (defined(__ISO_C_VISIBLE) && __ISO_C_VISIBLE >= 2011) || __cplusplus >= 201103L
 #  if defined(__FreeBSD__)
 #    define _LIBCUDACXX_HAS_QUICK_EXIT
 #    define _LIBCUDACXX_HAS_C11_FEATURES
@@ -598,9 +598,11 @@ extern "C++" {
 
 // TODO: Clang incorrectly reports that __is_array is true for T[0].
 //       Re-enable the branch once https://llvm.org/PR54705 is fixed.
+#ifndef _LIBCUDACXX_USE_IS_ARRAY_FALLBACK
 #if defined(_LIBCUDACXX_COMPILER_CLANG)
 #define _LIBCUDACXX_USE_IS_ARRAY_FALLBACK
 #endif // _LIBCUDACXX_COMPILER_CLANG
+#endif // !_LIBCUDACXX_USE_IS_ARRAY_FALLBACK
 
 #if __check_builtin(is_assignable)     \
  || defined(_LIBCUDACXX_COMPILER_MSVC)
@@ -676,9 +678,11 @@ extern "C++" {
 #define _LIBCUDACXX_IS_LVALUE_REFERENCE(...) __is_lvalue_reference(__VA_ARGS__)
 #endif // __check_builtin(is_lvalue_reference)
 
+#ifndef _LIBCUDACXX_USE_IS_LVALUE_REFERENCE_FALLBACK
 #if defined(_LIBCUDACXX_CUDACC_BELOW_11_3)
 #define _LIBCUDACXX_USE_IS_LVALUE_REFERENCE_FALLBACK
 #endif // nvcc < 11.3
+#endif // !_LIBCUDACXX_USE_IS_LVALUE_REFERENCE_FALLBACK
 
 #if __check_builtin(is_nothrow_assignable) \
  || defined(_LIBCUDACXX_COMPILER_MSVC)     \
@@ -702,9 +706,11 @@ extern "C++" {
 #define _LIBCUDACXX_IS_OBJECT(...) __is_object(__VA_ARGS__)
 #endif // __check_builtin(is_object)
 
+#ifndef _LIBCUDACXX_USE_IS_OBJECT_FALLBACK
 #if defined(_LIBCUDACXX_CUDACC_BELOW_11_3)
 #define _LIBCUDACXX_USE_IS_OBJECT_FALLBACK
 #endif // nvcc < 11.3
+#endif // !_LIBCUDACXX_USE_IS_OBJECT_FALLBACK
 
 #if __check_builtin(is_pod)                                  \
  || (defined(_LIBCUDACXX_COMPILER_GCC)  && _GNUC_VER >= 403) \
@@ -804,9 +810,11 @@ extern "C++" {
 #define _LIBCUDACXX_IS_UNSIGNED(...) __is_unsigned(__VA_ARGS__)
 #endif // __check_builtin(is_unsigned)
 
+#ifndef _LIBCUDACXX_USE_IS_UNSIGNED_FALLBACK
 #if defined(_LIBCUDACXX_CUDACC_BELOW_11_3)
 #define _LIBCUDACXX_USE_IS_UNSIGNED_FALLBACK
 #endif // nvcc < 11.3
+#endif // !_LIBCUDACXX_USE_IS_UNSIGNED_FALLBACK
 
 // libstdc++ defines this as a function, breaking functionality
 #if 0 // __check_builtin(is_void)
@@ -980,11 +988,12 @@ typedef __char32_t char32_t;
 
 #elif defined(_LIBCUDACXX_COMPILER_GCC)
 
+#ifndef _LIBCUDACXX_USE_IS_ASSIGNABLE_FALLBACK
 // FIXME: GCC 8.0 supports this trait, but it has a bug.
 // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91592
 // https://godbolt.org/z/IljfIw
 #define _LIBCUDACXX_USE_IS_ASSIGNABLE_FALLBACK
-
+#endif // _LIBCUDACXX_USE_IS_ASSIGNABLE_FALLBACK
 
 // Determine if GCC supports relaxed constexpr
 #if !defined(__cpp_constexpr) || __cpp_constexpr < 201304L
@@ -1762,32 +1771,6 @@ typedef unsigned int   char32_t;
 #  define _LIBCUDACXX_NODISCARD_FRIEND _LIBCUDACXX_NODISCARD_ATTRIBUTE friend
 #endif // !_LIBCUDACXX_CUDACC_BELOW_11_3 && !_LIBCUDACXX_COMPILER_CLANG
 
-#  ifdef _LIBCUDACXX_COMPILER_CLANG
-#    define _LIBCUDACXX_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push")
-#    define _LIBCUDACXX_DIAGNOSTIC_POP _Pragma("clang diagnostic pop")
-#    define _LIBCUDACXX_CLANG_DIAGNOSTIC_IGNORED(str) _Pragma(_LIBCUDACXX_TOSTRING(clang diagnostic ignored str))
-#    define _LIBCUDACXX_GCC_DIAGNOSTIC_IGNORED(str)
-#    define _LIBCUDACXX_NVHPC_DIAGNOSTIC_IGNORED(str)
-#  elif defined(_LIBCUDACXX_COMPILER_GCC)
-#    define _LIBCUDACXX_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push")
-#    define _LIBCUDACXX_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop")
-#    define _LIBCUDACXX_CLANG_DIAGNOSTIC_IGNORED(str)
-#    define _LIBCUDACXX_GCC_DIAGNOSTIC_IGNORED(str) _Pragma(_LIBCUDACXX_TOSTRING(GCC diagnostic ignored str))
-#    define _LIBCUDACXX_NVHPC_DIAGNOSTIC_IGNORED(str)
-#  elif defined(_LIBCUDACXX_COMPILER_NVHPC)
-#    define _LIBCUDACXX_DIAGNOSTIC_PUSH _Pragma("diagnostic push")
-#    define _LIBCUDACXX_DIAGNOSTIC_POP _Pragma("diagnostic pop")
-#    define _LIBCUDACXX_CLANG_DIAGNOSTIC_IGNORED(str)
-#    define _LIBCUDACXX_GCC_DIAGNOSTIC_IGNORED(str)
-#    define _LIBCUDACXX_NVHPC_DIAGNOSTIC_IGNORED(str) _Pragma(_LIBCUDACXX_TOSTRING(diag_suppress str))
-#  else
-#    define _LIBCUDACXX_DIAGNOSTIC_PUSH
-#    define _LIBCUDACXX_DIAGNOSTIC_POP
-#    define _LIBCUDACXX_CLANG_DIAGNOSTIC_IGNORED(str)
-#    define _LIBCUDACXX_GCC_DIAGNOSTIC_IGNORED(str)
-#    define _LIBCUDACXX_NVHPC_DIAGNOSTIC_IGNORED(str)
-#  endif
-
 // _LIBCUDACXX_NODISCARD_EXT may be used to apply [[nodiscard]] to entities not
 // specified as such as an extension.
 #if defined(_LIBCUDACXX_ENABLE_NODISCARD) && !defined(_LIBCUDACXX_DISABLE_NODISCARD_EXT)

libcudacxx/include/cuda/std/detail/libcxx/include/__cuda/barrier.h

@@ -29,7 +29,10 @@
 
 #include "../cstdlib"                // _LIBCUDACXX_UNREACHABLE
 #include "../__type_traits/void_t.h" // _CUDA_VSTD::__void_t
+
+#if defined(_CCCL_CUDA_COMPILER)
 #include "../__cuda/ptx.h"           // cuda::ptx::*
+#endif // _CCCL_CUDA_COMPILER
 
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)
 #define _LIBCUDACXX_OFFSET_IS_ZERO(type, member) !(&(((type *)0)->member))
@@ -567,6 +570,7 @@ inline _CUDA_VSTD::uint64_t * barrier_native_handle(barrier<thread_scope_block>
     return reinterpret_cast<_CUDA_VSTD::uint64_t *>(&b.__barrier);
 }
 
+#if defined(_CCCL_CUDA_COMPILER)
 
 // Hide arrive_tx when CUDA architecture is insufficient. Note the
 // (!defined(__CUDA_MINIMUM_ARCH__)). This is required to make sure the function
@@ -686,9 +690,12 @@ void barrier_expect_tx(
         : "memory");
 }
 #endif // __CUDA_MINIMUM_ARCH__
+#endif // _CCCL_CUDA_COMPILER
 
 _LIBCUDACXX_END_NAMESPACE_CUDA_DEVICE
 
+#if defined(_CCCL_CUDA_COMPILER)
+
 _LIBCUDACXX_BEGIN_NAMESPACE_CUDA
 
 template<>
@@ -1218,4 +1225,6 @@ async_contract_fulfillment memcpy_async(void * __destination, void const * __sou
 
 _LIBCUDACXX_END_NAMESPACE_CUDA
 
+#endif // _CCCL_CUDA_COMPILER
+
 #endif // _LIBCUDACXX___CUDA_BARRIER_H

libcudacxx/include/cuda/std/detail/libcxx/include/__expected/bad_expected_access.h

@@ -13,9 +13,6 @@
 #include <__config>
 #endif // __cuda_std__
 
-#include "../__utility/move.h"
-#include "../exception"
-
 #if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
 #  pragma GCC system_header
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
@@ -24,7 +21,10 @@
 #  pragma system_header
 #endif // no system header
 
-#if _LIBCUDACXX_STD_VER > 11
+#include "../__utility/move.h"
+#include "../exception"
+
+#if _LIBCUDACXX_STD_VER  > 11
 
 _LIBCUDACXX_BEGIN_NAMESPACE_STD
 
@@ -39,15 +39,15 @@ class bad_expected_access<void> : public exception {
   bad_expected_access(bad_expected_access&&)                 = default;
   bad_expected_access& operator=(const bad_expected_access&) = default;
   bad_expected_access& operator=(bad_expected_access&&)      = default;
-  ~bad_expected_access() override                            = default;
+  ~bad_expected_access() noexcept override                   = default;
 
 public:
   // The way this has been designed (by using a class template below) means that we'll already
   // have a profusion of these vtables in TUs, and the dynamic linker will already have a bunch
   // of work to do. So it is not worth hiding the <void> specialization in the dylib, given that
   // it adds deployment target restrictions.
   _LIBCUDACXX_INLINE_VISIBILITY
-  const char* what() const noexcept override { return "bad access to _CUDA_VSTD::expected"; }
+  const char* what() const noexcept override { return "bad access to std::expected"; }
 };
 
 template <class _Err>

libcudacxx/include/cuda/std/detail/libcxx/include/__functional/binary_function.h

@@ -45,12 +45,10 @@ template <class _Arg1, class _Arg2, class _Result> struct __binary_function_keep
 };
 
 #if _LIBCUDACXX_STD_VER <= 14 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION)
-_LIBCUDACXX_DIAGNOSTIC_PUSH
-_LIBCUDACXX_CLANG_DIAGNOSTIC_IGNORED("-Wdeprecated-declarations")
-_LIBCUDACXX_GCC_DIAGNOSTIC_IGNORED("-Wdeprecated-declarations")
+_CCCL_DIAG_SUPPRESS_DEPRECATED_PUSH
 template <class _Arg1, class _Arg2, class _Result>
 using __binary_function = binary_function<_Arg1, _Arg2, _Result>;
-_LIBCUDACXX_DIAGNOSTIC_POP
+_CCCL_DIAG_SUPPRESS_DEPRECATED_POP
 #else
 template <class _Arg1, class _Arg2, class _Result>
 using __binary_function = __binary_function_keep_layout_base<_Arg1, _Arg2, _Result>;

libcudacxx/include/cuda/std/detail/libcxx/include/__functional/binder1st.h

@@ -29,6 +29,8 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD
 
 #if _LIBCUDACXX_STD_VER <= 14 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS)
 
+_CCCL_DIAG_SUPPRESS_DEPRECATED_PUSH
+
 template <class __Operation>
 class _LIBCUDACXX_TEMPLATE_VIS _LIBCUDACXX_DEPRECATED_IN_CXX11 binder1st
     : public __unary_function<typename __Operation::second_argument_type, typename __Operation::result_type>
@@ -56,6 +58,8 @@ binder1st<__Operation>
 bind1st(const __Operation& __op, const _Tp& __x)
     {return binder1st<__Operation>(__op, __x);}
 
+_CCCL_DIAG_SUPPRESS_DEPRECATED_POP
+
 #endif // _LIBCUDACXX_STD_VER <= 14 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS)
 
 _LIBCUDACXX_END_NAMESPACE_STD

libcudacxx/include/cuda/std/detail/libcxx/include/__functional/binder2nd.h

@@ -29,6 +29,8 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD
 
 #if _LIBCUDACXX_STD_VER <= 14 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS)
 
+_CCCL_DIAG_SUPPRESS_DEPRECATED_PUSH
+
 template <class __Operation>
 class _LIBCUDACXX_TEMPLATE_VIS _LIBCUDACXX_DEPRECATED_IN_CXX11 binder2nd
     : public __unary_function<typename __Operation::first_argument_type, typename __Operation::result_type>
@@ -56,6 +58,8 @@ binder2nd<__Operation>
 bind2nd(const __Operation& __op, const _Tp& __x)
     {return binder2nd<__Operation>(__op, __x);}
 
+_CCCL_DIAG_SUPPRESS_DEPRECATED_POP
+
 #endif // _LIBCUDACXX_STD_VER <= 14 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS)
 
 _LIBCUDACXX_END_NAMESPACE_STD

libcudacxx/include/cuda/std/detail/libcxx/include/__functional/mem_fun_ref.h

@@ -30,6 +30,8 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD
 
 #if _LIBCUDACXX_STD_VER <= 14 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS)
 
+_CCCL_DIAG_SUPPRESS_DEPRECATED_PUSH
+
 template<class _Sp, class _Tp>
 class _LIBCUDACXX_TEMPLATE_VIS _LIBCUDACXX_DEPRECATED_IN_CXX11 mem_fun_t
     : public __unary_function<_Tp*, _Sp>
@@ -174,6 +176,8 @@ const_mem_fun1_ref_t<_Sp,_Tp,_Ap>
 mem_fun_ref(_Sp (_Tp::*__f)(_Ap) const)
     {return const_mem_fun1_ref_t<_Sp,_Tp,_Ap>(__f);}
 
+_CCCL_DIAG_SUPPRESS_DEPRECATED_POP
+
 #endif // _LIBCUDACXX_STD_VER <= 14 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS)
 
 _LIBCUDACXX_END_NAMESPACE_STD