rvalue_T

Author: smallp-o-p

libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp

@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-//
+
 // REQUIRED: std-at-least-c++17
 
 // <optional>
@@ -27,32 +27,27 @@ class Z {
   Z(Z&&) { TEST_THROW(6); }
 };
 
-int main(int, char**) {
+template <typename T, typename U>
+constexpr void test_rvalueT(U arg) {
   {
-    typedef int T;
-    constexpr optional<T> opt(T(5));
-    static_assert(static_cast<bool>(opt) == true, "");
-    static_assert(*opt == 5, "");
-
-    struct test_constexpr_ctor : public optional<T> {
-      constexpr test_constexpr_ctor(T&&) {}
-    };
-  }
-  {
-    typedef double T;
-    constexpr optional<T> opt(T(3));
-    static_assert(static_cast<bool>(opt) == true, "");
-    static_assert(*opt == 3, "");
-
-    struct test_constexpr_ctor : public optional<T> {
-      constexpr test_constexpr_ctor(T&&) {}
-    };
+    const optional<T> opt(arg);
+    assert(bool(opt));
+    assert(*opt == T(arg));
   }
+
   {
-    const int x = 42;
-    optional<const int> o(std::move(x));
-    assert(*o == 42);
+    T t(arg);
+    optional<T> opt(std::move(t));
+    assert(*opt == T(arg));
   }
+
+  struct test_constexpr_ctor : public optional<T> {
+    constexpr test_constexpr_ctor(T&&) {}
+    constexpr test_constexpr_ctor(const T&) {}
+  };
+}
+
+void test_rt() {
   {
     typedef TestTypes::TestType T;
     T::reset();
@@ -83,37 +78,9 @@ int main(int, char**) {
     assert(static_cast<bool>(opt) == true);
     assert(opt.value().value == 3);
   }
-  {
-    typedef ConstexprTestTypes::TestType T;
-    constexpr optional<T> opt = {T(3)};
-    static_assert(static_cast<bool>(opt) == true, "");
-    static_assert(opt.value().value == 3, "");
-
-    struct test_constexpr_ctor : public optional<T> {
-      constexpr test_constexpr_ctor(const T&) {}
-    };
-  }
-  {
-    typedef ConstexprTestTypes::TestType T;
-    constexpr optional<T> opt = {3};
-    static_assert(static_cast<bool>(opt) == true, "");
-    static_assert(opt.value().value == 3, "");
-
-    struct test_constexpr_ctor : public optional<T> {
-      constexpr test_constexpr_ctor(const T&) {}
-    };
-  }
-  {
-    typedef ExplicitConstexprTestTypes::TestType T;
-    static_assert(!std::is_convertible<T&&, optional<T>>::value, "");
-    constexpr optional<T> opt(T{3});
-    static_assert(static_cast<bool>(opt) == true, "");
-    static_assert(opt.value().value == 3, "");
+}
 
-    struct test_constexpr_ctor : public optional<T> {
-      constexpr test_constexpr_ctor(T&&) {}
-    };
-  }
+TEST_CONSTEXPR_CXX26 void test_throwing() {
 #ifndef TEST_HAS_NO_EXCEPTIONS
   {
     try {
@@ -125,6 +92,49 @@ int main(int, char**) {
     }
   }
 #endif
+}
+
+constexpr bool test() {
+  test_rvalueT<int>(5);
+  test_rvalueT<double>(3.0);
+  test_rvalueT<const int>(42);
+
+  {
+    using T = ConstexprTestTypes::TestType;
+    test_rvalueT<T>(T(3));
+  }
+
+  {
+    using T = ConstexprTestTypes::TestType;
+    test_rvalueT<T>(3);
+  }
+
+  {
+    using T = ExplicitConstexprTestTypes::TestType;
+    static_assert(!std::is_convertible<T&&, optional<T>>::value);
+    test_rvalueT<T>(T(3));
+  }
+#if TEST_STD_VER >= 26 && 0
+  {
+    test_throwing();
+  }
+
+#endif
+
+  return true;
+}
+
+int main(int, char**) {
+  test();
+  static_assert(test());
+
+  {
+    test_rt();
+  }
+
+  {
+    test_throwing();
+  }
 
   return 0;
 }