Merge pull request #187 from NVIDIA/bugfix/clang12_gcc11_compat

Several fixes for Clang 12 and GCC 11

Author: wmaxey

.upstream-tests/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/deduct.pass.cpp

@@ -96,9 +96,11 @@ __host__ __device__ void test_primary_template()
     cuda::std::tuple t1(T{});
     ASSERT_SAME_TYPE(decltype(t1), cuda::std::tuple<T>);
 
+#if defined(__GNUC__) && (__GNUC__ < 11)
     const T v{};
     cuda::std::tuple t2(T{}, 101l, v);
     ASSERT_SAME_TYPE(decltype(t2), cuda::std::tuple<T, long, T>);
+#endif
   }
   // cuda::std::allocator not supported
   /*

include/cuda/std/detail/__config

@@ -43,6 +43,10 @@
 #ifndef _LIBCUDACXX_NO_RTTI
     #define _LIBCUDACXX_NO_RTTI
 #endif
+// Disable the nodebug type
+#ifndef _LIBCUDACXX_NODEBUG_TYPE
+    #define _LIBCUDACXX_NODEBUG_TYPE
+#endif
 #define _LIBCUDACXX_HAS_NO_INT128
 #define _LIBCUDACXX_FREESTANDING
 #define _LIBCUDACXX_HAS_NO_THREAD_CONTENTION_TABLE

libcxx/include/__config

@@ -1674,7 +1674,7 @@ _LIBCUDACXX_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
 
 #ifndef _LIBCUDACXX_NODEBUG_TYPE
 #if __has_attribute(__nodebug__) && \
-    (defined(_LIBCUDACXX_CLANG_VER) && _LIBCUDACXX_CLANG_VER >= 1200)
+    (defined(_LIBCUDACXX_CLANG_VER) && _LIBCUDACXX_CLANG_VER >= 1210)
 #define _LIBCUDACXX_NODEBUG_TYPE __attribute__((nodebug))
 #else
 #define _LIBCUDACXX_NODEBUG_TYPE