Try harder to keep nvrtc happy

nvrtc balks at the array constructor of a zero dimensional span as that would be illegal.
NVIDIA · Nov 11, 2022 · 4c3bc98 · 4c3bc98
1 parent eec0186
commit 4c3bc98
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 3 deletions.
diff --git a/.upstream-tests/test/std/views/views.span/span.cons/array.fail.cpp b/.upstream-tests/test/std/views/views.span/span.cons/array.fail.cpp
@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 // UNSUPPORTED: c++03, c++11
+// UNSUPPORTED: nvrtc
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.cons/default.fail.cpp b/.upstream-tests/test/std/views/views.span/span.cons/default.fail.cpp
@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 // UNSUPPORTED: c++03, c++11
+// UNSUPPORTED: nvrtc
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.cons/iterator_len.verify.cpp b/.upstream-tests/test/std/views/views.span/span.cons/iterator_len.verify.cpp
@@ -7,6 +7,7 @@
 //
 //===---------------------------------------------------------------------===//
 // UNSUPPORTED: c++03, c++11
+// UNSUPPORTED: nvrtc
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.cons/range.verify.cpp b/.upstream-tests/test/std/views/views.span/span.cons/range.verify.cpp
@@ -7,6 +7,7 @@
 //
 //===---------------------------------------------------------------------===//
 // UNSUPPORTED: c++03, c++11
+// UNSUPPORTED: nvrtc
 
 // <cuda/std/span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.cons/span.fail.cpp b/.upstream-tests/test/std/views/views.span/span.cons/span.fail.cpp
@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 // UNSUPPORTED: c++03, c++11
+// UNSUPPORTED: nvrtc
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.elem/back.pass.cpp b/.upstream-tests/test/std/views/views.span/span.elem/back.pass.cpp
@@ -30,15 +30,15 @@ __host__ __device__
 constexpr bool testConstexprSpan(Span sp)
 {
     ASSERT_NOEXCEPT(sp.back());
-    return &sp.back() == sp.data() + sp.size() - 1;
+    return &sp.back() == sp.data() + (sp.size() - 1);
 }
 
 template <typename Span>
 __host__ __device__
 void testRuntimeSpan(Span sp)
 {
     ASSERT_NOEXCEPT(sp.back());
-    assert(&sp.back() == sp.data() + sp.size() - 1);
+    assert(&sp.back() == sp.data() + (sp.size() - 1));
 }
 
 template <typename Span>

diff --git a/.upstream-tests/test/std/views/views.span/span.objectrep/as_writable_bytes.verify.cpp b/.upstream-tests/test/std/views/views.span/span.objectrep/as_writable_bytes.verify.cpp
@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 // UNSUPPORTED: c++03, c++11
+// UNSUPPORTED: nvrtc
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.obs/empty.nodiscard.verify.cpp b/.upstream-tests/test/std/views/views.span/span.obs/empty.nodiscard.verify.cpp
@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 // UNSUPPORTED: c++03, c++11, c++14, c++17
+// UNSUPPORTED: nvrtc
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.sub/first.verify.cpp b/.upstream-tests/test/std/views/views.span/span.sub/first.verify.cpp
@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 // UNSUPPORTED: c++03, c++11
+// UNSUPPORTED: nvrtc
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.sub/last.verify.cpp b/.upstream-tests/test/std/views/views.span/span.sub/last.verify.cpp
@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 // UNSUPPORTED: c++03, c++11
+// UNSUPPORTED: nvrtc
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.sub/subspan.verify.cpp b/.upstream-tests/test/std/views/views.span/span.sub/subspan.verify.cpp
@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 // UNSUPPORTED: c++03, c++11
+// UNSUPPORTED: nvrtc
 
 // This test also generates spurious warnings when instantiating std::span
 // with a very large extent (like size_t(-2)) -- silence those.

diff --git a/include/cuda/std/detail/libcxx/include/span b/include/cuda/std/detail/libcxx/include/span
@@ -218,8 +218,12 @@ public:
         { (void)__count; _LIBCUDACXX_ASSERT(_Extent == __count, "size mismatch in span's constructor (ptr, len)"); }
     _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 span(pointer __f, pointer __l) : __data{__f}
         { (void)__l;     _LIBCUDACXX_ASSERT(_Extent == distance(__f, __l), "size mismatch in span's constructor (ptr, ptr)"); }
-
+#ifdef _LIBCUDACXX_COMPILER_NVRTC
+    template <size_t _Sz = _Extent, enable_if_t<_Sz != 0, nullptr_t> = nullptr>
+    _LIBCUDACXX_INLINE_VISIBILITY constexpr span(type_identity_t<element_type> (&__arr)[_Sz]) noexcept : __data{__arr} {}
+#else
     _LIBCUDACXX_INLINE_VISIBILITY constexpr span(type_identity_t<element_type> (&__arr)[_Extent]) noexcept : __data{__arr} {}
+#endif
     template <class _OtherElementType, enable_if_t<
                 is_convertible<_OtherElementType(*)[], element_type (*)[]>::value, nullptr_t> = nullptr>
     _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX14