Fix building with gcc-6 and make the test suite pass (NVIDIA#485)

* Add gcc-6 image

* Avoid build breaks due to gcc-6

* Disable failing libcxx tests for gcc-6

* Make tests pass with gcc-6 and c++14

* Make tests pass with gcc-6 and c++17

.upstream-tests/test/libcxx/type_traits/is_implicitly_default_constructible.pass.cpp

@@ -81,8 +81,10 @@ static_assert(!cuda::std::__is_implicitly_default_constructible<NonDefaultConstr
 static_assert(!cuda::std::__is_implicitly_default_constructible<NonDefaultConstructible3>::value, "");
 static_assert(!cuda::std::__is_implicitly_default_constructible<ProtectedDefaultConstructible>::value, "");
 static_assert(!cuda::std::__is_implicitly_default_constructible<PrivateDefaultConstructible>::value, "");
+#if !defined(TEST_COMPILER_GCC) || __GNUC__ > 6 // GCC 6 complains about implicit conversion
 static_assert(!cuda::std::__is_implicitly_default_constructible<ProtectedDefaultConstructibleWithBase>::value, "");
 static_assert(!cuda::std::__is_implicitly_default_constructible<PrivateDefaultConstructibleWithBase>::value, "");
+#endif // !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
 
 int main(int, char**) {
     return 0;

.upstream-tests/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/container.pass.cpp

@@ -17,10 +17,12 @@
 // explicit front_insert_iterator(Cont& x);
 
 #include <cuda/std/iterator>
+
+#include <cuda/std/cassert>
 #if defined(_LIBCUDACXX_HAS_LIST)
 #include <cuda/std/list>
-#endif
 #include "nasty_containers.h"
+#endif // _LIBCUDACXX_HAS_LIST
 
 #include "test_macros.h"
 

.upstream-tests/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op_assign/lv_value.pass.cpp

@@ -18,11 +18,12 @@
 //   operator=(const Cont::value_type& value);
 
 #include <cuda/std/iterator>
+
+#include <cuda/std/cassert>
 #if defined(_LIBCUDACXX_HAS_LIST)
 #include <cuda/std/list>
-#endif
-#include <cuda/std/cassert>
 #include "nasty_containers.h"
+#endif // _LIBCUDACXX_HAS_LIST
 
 #include "test_macros.h"
 

.upstream-tests/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op_astrk/test.pass.cpp

@@ -17,11 +17,12 @@
 // front_insert_iterator<Cont>& operator*();
 
 #include <cuda/std/iterator>
+
+#include <cuda/std/cassert>
 #if defined(_LIBCUDACXX_HAS_LIST)
 #include <cuda/std/list>
-#endif
-#include <cuda/std/cassert>
 #include "nasty_containers.h"
+#endif // _LIBCUDACXX_HAS_LIST
 
 #include "test_macros.h"
 

.upstream-tests/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op_increment/post.pass.cpp

@@ -17,11 +17,11 @@
 // front_insert_iterator<Cont> operator++(int);
 
 #include <cuda/std/iterator>
+#include <cuda/std/cassert>
 #if defined(_LIBCUDACXX_HAS_LIST)
 #include <cuda/std/list>
-#endif
-#include <cuda/std/cassert>
 #include "nasty_containers.h"
+#endif // _LIBCUDACXX_HAS_LIST
 
 #include "test_macros.h"
 

.upstream-tests/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op_increment/pre.pass.cpp

@@ -17,11 +17,11 @@
 // front_insert_iterator<Cont>& operator++();
 
 #include <cuda/std/iterator>
+#include <cuda/std/cassert>
 #if defined(_LIBCUDACXX_HAS_LIST)
 #include <cuda/std/list>
-#endif
-#include <cuda/std/cassert>
 #include "nasty_containers.h"
+#endif // _LIBCUDACXX_HAS_LIST
 
 #include "test_macros.h"
 

.upstream-tests/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.inserter/test.pass.cpp

@@ -17,11 +17,11 @@
 //   front_inserter(Cont& x);
 
 #include <cuda/std/iterator>
+#include <cuda/std/cassert>
 #if defined(_LIBCUDACXX_HAS_LIST)
 #include <cuda/std/list>
-#endif
-#include <cuda/std/cassert>
 #include "nasty_containers.h"
+#endif // _LIBCUDACXX_HAS_LIST
 
 #include "test_macros.h"
 

.upstream-tests/test/std/language.support/support.types/byteops/enum_direct_init.pass.cpp

@@ -13,6 +13,7 @@
 // The following compilers don't like "cuda::std::byte b1{1}"
 // XFAIL: clang-3.5, clang-3.6, clang-3.7, clang-3.8
 // XFAIL: apple-clang-6, apple-clang-7, apple-clang-8.0
+// UNSUPPORTED: gcc-6
 
 int main(int, char**) {
   constexpr cuda::std::byte b{42};

.upstream-tests/test/std/utilities/expected/expected.expected/monadic/and_then.pass.cpp

@@ -327,7 +327,7 @@ constexpr void test_sfinae() {
 struct NoCopy {
   NoCopy() = default;
   __host__ __device__
-  constexpr NoCopy(const NoCopy&);
+  constexpr NoCopy(const NoCopy&) = delete;
   __host__ __device__
   constexpr cuda::std::expected<int, TestError> operator()(const NoCopy&&) { return 1; }
 };

.upstream-tests/test/std/utilities/expected/expected.expected/monadic/or_else.pass.cpp

@@ -327,7 +327,7 @@ constexpr void test_sfinae() {
 struct NoCopy {
   NoCopy() = default;
   __host__ __device__
-  constexpr NoCopy(const NoCopy&);
+  constexpr NoCopy(const NoCopy&) = delete;
   __host__ __device__
   constexpr cuda::std::expected<int, TestError> operator()(const NoCopy&&) { return 1; }
 };

.upstream-tests/test/std/utilities/expected/expected.expected/monadic/transform.pass.cpp

@@ -243,7 +243,7 @@ constexpr void test_sfinae() {
 struct NoCopy {
   NoCopy() = default;
   __host__ __device__
-  constexpr NoCopy(const NoCopy&);
+  constexpr NoCopy(const NoCopy&) = delete;
   __host__ __device__
   constexpr int operator()(const NoCopy&&) { return 1; }
 };

.upstream-tests/test/std/utilities/expected/expected.expected/monadic/transform_error.pass.cpp

@@ -242,7 +242,7 @@ constexpr void test_sfinae() {
 struct NoCopy {
   NoCopy() = default;
   __host__ __device__
-  constexpr NoCopy(const NoCopy&);
+  constexpr NoCopy(const NoCopy&) = delete;
   __host__ __device__
   constexpr int operator()(const NoCopy&&) { return 42; }
 };

.upstream-tests/test/std/utilities/expected/expected.expected/swap/free.swap.pass.cpp

@@ -8,6 +8,8 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++03, c++11
+// UNSUPPORTED: gcc-6
+
 // Older Clangs do not support the C++20 feature to constrain destructors
 
 // friend constexpr void swap(expected& x, expected& y) noexcept(noexcept(x.swap(y)));

.upstream-tests/test/std/utilities/expected/expected.unexpected/ctad.compile.pass.cpp

@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++03, c++11, c++14
-// UNSUPPORTED: gcc-7, gcc-8, gcc-9
+// UNSUPPORTED: gcc-6, gcc-7, gcc-8, gcc-9
 
 // template<class E> unexpected(E) -> unexpected<E>;
 

.upstream-tests/test/std/utilities/expected/expected.void/swap/free.swap.pass.cpp

@@ -8,6 +8,8 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++03, c++11
+// UNSUPPORTED: gcc-6
+
 // Older Clangs do not support the C++20 feature to constrain destructors
 
 // friend constexpr void swap(expected& x, expected& y) noexcept(noexcept(swap(x,y)));

.upstream-tests/test/std/utilities/function.objects/func.bind_front/bind_front.pass.cpp

@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++03, c++11, c++14
+// UNSUPPORTED: gcc-6
 
 // functional
 

.upstream-tests/test/std/utilities/function.objects/func.not_fn/not_fn.pass.cpp

@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
+// UNSUPPORTED: gcc-6
 
 // TODO: there's multiple failures that appear to be all about overload resolution and SFINAE,
 // and they will require further debugging to pinpoint the root cause of (almost certainly a

.upstream-tests/test/std/utilities/function.objects/refwrap/refwrap.const/deduct.pass.cpp

@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++03, c++11, c++14
-// XFAIL: gcc-7
+// XFAIL: gcc-6, gcc-7
 
 // <functional>
 

.upstream-tests/test/std/utilities/memory/specialized.algorithms/specialized.destroy/destroy.pass.cpp

@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++03, c++11, c++14
+// UNSUPPORTED: gcc-6
 
 // <memory>
 

.upstream-tests/test/std/utilities/memory/specialized.algorithms/specialized.destroy/destroy_at.pass.cpp

@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++03, c++11, c++14
+// UNSUPPORTED: gcc-6
 
 // <memory>
 

.upstream-tests/test/std/utilities/memory/specialized.algorithms/specialized.destroy/destroy_n.pass.cpp

@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++03, c++11, c++14
+// UNSUPPORTED: gcc-6
 
 // <memory>
 

.upstream-tests/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp

@@ -314,7 +314,9 @@ int main(int, char**)
 #endif
     test_throws();
 
+#if !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
     static_assert(pr38638(3) == 5, "");
+#endif // !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
 
   return 0;
 }

.upstream-tests/test/std/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp

@@ -58,15 +58,19 @@ int main(int, char**)
 {
     {
         using O = optional<int>;
+#if !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
         static_assert(assign_empty(O{42}), "");
         static_assert(assign_value(O{42}), "");
+#endif // !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
         assert(assign_empty(O{42}));
         assert(assign_value(O{42}));
     }
     {
         using O = optional<TrivialTestTypes::TestType>;
+#if !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
         static_assert(assign_empty(O{42}), "");
         static_assert(assign_value(O{42}), "");
+#endif // !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
         assert(assign_empty(O{42}));
         assert(assign_value(O{42}));
     }

.upstream-tests/test/std/utilities/optional/optional.object/optional.object.assign/move.pass.cpp

@@ -115,15 +115,19 @@ int main(int, char**)
     }
     {
         using O = optional<int>;
+#if !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
         static_assert(assign_empty(O{42}), "");
         static_assert(assign_value(O{42}), "");
+#endif // !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
         assert(assign_empty(O{42}));
         assert(assign_value(O{42}));
     }
     {
         using O = optional<TrivialTestTypes::TestType>;
+#if !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
         static_assert(assign_empty(O{42}), "");
         static_assert(assign_value(O{42}), "");
+#endif // !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
         assert(assign_empty(O{42}));
         assert(assign_value(O{42}));
     }

.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp

@@ -15,7 +15,7 @@
 // is provided explicitly instead of being deduced, it compiles the test fine.
 // Given that the deduction guide is trivial, this appears to be a compiler bug,
 // so just don't run this test on GCC 7.
-// UNSUPPORTED: gcc-7
+// UNSUPPORTED: gcc-6, gcc-7
 
 // template<class T>
 //   optional(T) -> optional<T>;

.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/op_arrow_const.pass.cpp

@@ -58,6 +58,8 @@ int main(int, char**)
         constexpr optional<X> opt(X{});
 #if defined(_LIBCUDACXX_ADDRESSOF)
         static_assert(opt->test() == 3, "");
+#else
+        unused(opt);
 #endif
     }
     {
@@ -68,6 +70,8 @@ int main(int, char**)
         constexpr optional<Z> opt(Z{});
 #if defined(_LIBCUDACXX_ADDRESSOF)
         static_assert(opt->test() == 1, "");
+#else
+        unused(opt);
 #endif
     }
 

.upstream-tests/test/std/utilities/optional/optional.specalg/swap.pass.cpp

@@ -8,6 +8,8 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++03, c++11
+// UNSUPPORTED: gcc-6
+
 // <cuda/std/optional>
 
 // template <class T> void swap(optional<T>& x, optional<T>& y)

.upstream-tests/test/std/utilities/tuple/tuple.tuple/tuple.apply/apply.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 // UNSUPPORTED: nvrtc
+// UNSUPPORTED: gcc-6
 
 // <cuda/std/tuple>
 

.upstream-tests/test/std/utilities/tuple/tuple.tuple/tuple.apply/apply_extended_types.pass.cpp

@@ -9,6 +9,7 @@
 
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
+// UNSUPPORTED: gcc-6
 
 
 // <cuda/std/tuple>

.upstream-tests/test/std/utilities/tuple/tuple.tuple/tuple.apply/apply_large_arity.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 // UNSUPPORTED: nvrtc
+// UNSUPPORTED: gcc-6
 // UNSUPPORTED: windows
 // We run out of heap space with windows
 

.upstream-tests/test/std/utilities/tuple/tuple.tuple/tuple.apply/make_from_tuple.pass.cpp

@@ -8,6 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 // UNSUPPORTED: nvrtc
+// UNSUPPORTED: gcc-6
 
 
 // <cuda/std/tuple>

.upstream-tests/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_v.pass.cpp

@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
+// UNSUPPORTED: gcc-6
 
 
 // <cuda/std/tuple>

.upstream-tests/utils/libcudacxx/test/config.py

@@ -628,12 +628,12 @@ def configure_default_compile_flags(self):
             if self.cxx.type == 'gcc':
                 maj_v, _, _ = self.cxx.version
                 maj_v = int(maj_v)
-                if maj_v < 7:
+                if maj_v < 6:
                     possible_stds.remove('c++1z')
                     possible_stds.remove('c++17')
                 # FIXME: How many C++14 tests actually fail under GCC 5 and 6?
                 # Should we XFAIL them individually instead?
-                if maj_v <= 6:
+                if maj_v < 6:
                     possible_stds.remove('c++14')
             for s in possible_stds:
                 cxx = self.cxx

environments/linux/docker/compose.yml

@@ -277,6 +277,19 @@ services:
 
 
 ### Ubuntu 18.04 images:
+  gcc-6:
+    extends:
+      service: ubuntu18.04
+    image: "libcudacxx/gcc-6"
+    container_name: gcc-6
+    profiles: ["gcc-6", "all", "base"]
+    build:
+      context: ../../../
+      dockerfile: environments/linux/docker/ubuntu.base.Dockerfile
+      target: libcudacxx-configured
+      args:
+        HOST_CXX: "g++-6"
+
   gcc-7:
     extends:
       service: ubuntu18.04

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

@@ -2126,8 +2126,9 @@ extern "C" _LIBCUDACXX_FUNC_VIS void __sanitizer_annotate_contiguous_container(
 // macro is used to mark them as such, which suppresses the
 // '-Wctad-maybe-unsupported' compiler warning when CTAD is used in user code
 // with these classes.
-#if _LIBCUDACXX_STD_VER >= 17
-#    define _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(_ClassName)                                                                \
+#if (!defined(_LIBCUDACXX_COMPILER_GCC) || __GNUC__ > 6) \
+ && _LIBCUDACXX_STD_VER >= 17
+#  define _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(_ClassName)                                                                \
       template <class ..._Tag>                                                                                         \
       _ClassName(typename _Tag::__allow_ctad...) -> _ClassName<_Tag...>
 #else