[libcxx] r333381 - Fix up the final bits of breakage due to clang v5 generating bad implicit template deduction guides - specifically for copy-ctors

[Marshall Clow via cfe-commits]

Author: marshall
Date: Mon May 28 12:20:21 2018
New Revision: 333381

URL: http://llvm.org/viewvc/llvm-project?rev=333381&view=rev
Log:
Fix up the final bits of breakage due to clang v5 generating bad implicit template deduction guides - specifically for copy-ctors

Modified:
    libcxx/trunk/test/std/containers/sequences/array/array.cons/deduct.pass.cpp
    libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp
    libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp

Modified: libcxx/trunk/test/std/containers/sequences/array/array.cons/deduct.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/array/array.cons/deduct.pass.cpp?rev=333381&r1=333380&r2=333381&view=diff
==============================================================================
--- libcxx/trunk/test/std/containers/sequences/array/array.cons/deduct.pass.cpp (original)
+++ libcxx/trunk/test/std/containers/sequences/array/array.cons/deduct.pass.cpp Mon May 28 12:20:21 2018
@@ -9,7 +9,10 @@
 
 // <array>
 // UNSUPPORTED: c++98, c++03, c++11, c++14
+// UNSUPPORTED: clang-5
 // UNSUPPORTED: libcpp-no-deduction-guides
+// Clang 5 will generate bad implicit deduction guides
+//	Specifically, for the copy constructor.
 
 
 // template <class T, class... U>
@@ -51,8 +54,6 @@ int main()
     }
 
 //  Test the implicit deduction guides
-// FIXME broken: no matching constructor
-#if 0
   {
   std::array<double, 2> source = {4.0, 5.0};
   std::array arr(source);   // array(array)
@@ -61,5 +62,4 @@ int main()
     assert(arr[0] == 4.0);
     assert(arr[1] == 5.0);
   }
-#endif
 }

Modified: libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp?rev=333381&r1=333380&r2=333381&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp (original)
+++ libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp Mon May 28 12:20:21 2018
@@ -9,7 +9,10 @@
 
 // <optional>
 // UNSUPPORTED: c++98, c++03, c++11, c++14
+// UNSUPPORTED: clang-5
 // UNSUPPORTED: libcpp-no-deduction-guides
+// Clang 5 will generate bad implicit deduction guides
+//  Specifically, for the copy constructor.
 
 
 // template<class T>
@@ -28,7 +31,12 @@ int main()
 //  Test the implicit deduction guides
     {
 //  optional()
-    std::optional opt;   // expected-error {{declaration of variable 'opt' with deduced type 'std::optional' requires an initializer}}
+    std::optional opt;   // expected-error-re {{{{declaration of variable 'opt' with deduced type 'std::optional' requires an initializer|no viable constructor or deduction guide for deduction of template arguments of 'optional'}}}}
+//  clang-6 gives a bogus error here:
+//      declaration of variable 'opt' with deduced type 'std::optional' requires an initializer
+//  clang-7 (and later) give a better message:
+//      no viable constructor or deduction guide for deduction of template arguments of 'optional'
+//  So we check for one or the other.
     }
 
     {

Modified: libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp?rev=333381&r1=333380&r2=333381&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp (original)
+++ libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp Mon May 28 12:20:21 2018
@@ -9,7 +9,10 @@
 
 // <optional>
 // UNSUPPORTED: c++98, c++03, c++11, c++14
+// UNSUPPORTED: clang-5
 // UNSUPPORTED: libcpp-no-deduction-guides
+// Clang 5 will generate bad implicit deduction guides
+//  Specifically, for the copy constructor.
 
 
 // template<class T>
@@ -40,18 +43,12 @@ int main()
     }
 
 //  Test the implicit deduction guides
-
     {
-//  optional(const optional &);
-      // FIXME clang and GCC disagree about this!
-      // clang thinks opt is optional<optional<char>>, GCC thinks it's optional<char>.
-#if 0
+//  optional(optional);
     std::optional<char> source('A');
     std::optional opt(source);
-    static_assert(std::is_same_v<decltype(opt), std::optional<std::optional<char>>>, "");
+    static_assert(std::is_same_v<decltype(opt), std::optional<char>>, "");
     assert(static_cast<bool>(opt) == static_cast<bool>(source));
     assert(*opt == *source);
-#endif
     }
-
 }