Update status for std::optional LWG issues and fix an optional SFINAE bug

llvm-svn: 284323

1 files changed, 12 insertions, 0 deletions

diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp
index 6abdd0db63c..1207e24150f 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp
@@ -48,6 +48,16 @@ struct MismatchType {
   MismatchType& operator=(char*) = delete;
 };
 
+struct FromOptionalType {
+  using Opt = std::optional<FromOptionalType>;
+  FromOptionalType() = default;
+  FromOptionalType(FromOptionalType const&) = delete;
+  template <class Dummy = void>
+  constexpr FromOptionalType(Opt&) { Dummy::BARK; }
+  template <class Dummy = void>
+  constexpr FromOptionalType& operator=(Opt&) { Dummy::BARK; return *this; }
+};
+
 void test_sfinae() {
     using I = TestTypes::TestType;
     using E = ExplicitTestTypes::TestType;
@@ -68,6 +78,8 @@ void test_sfinae() {
     assert_assignable<MismatchType, int>();
     assert_assignable<MismatchType, int*, false>();
     assert_assignable<MismatchType, char*, false>();
+    // Type constructible from optional
+    assert_assignable<FromOptionalType, std::optional<FromOptionalType>&, false>();
 }
 
 void test_with_test_type()