Make std::forward and std::move (and std::move_if_noexcept) constexpr in C++14

llvm-svn: 186344

2 files changed, 13 insertions, 0 deletions

diff --git a/libcxx/test/utilities/utility/forward/forward.pass.cpp b/libcxx/test/utilities/utility/forward/forward.pass.cpp
index b62eed5d8fc..aed396ee49b 100644
--- a/libcxx/test/utilities/utility/forward/forward.pass.cpp
+++ b/libcxx/test/utilities/utility/forward/forward.pass.cpp
@@ -70,4 +70,11 @@ int main()
     static_assert(sizeof(test(std::forward<const A>(ca))) == 2, "");
     static_assert(sizeof(test(std::forward<const A>(csource()))) == 2, "");
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
+
+#if _LIBCPP_STD_VER > 11
+	constexpr int i1 = std::move(23);
+	static_assert(i1 == 23, "" );
+	constexpr int i2 = std::forward<int>(42);
+	static_assert(i2 == 42, "" );
+#endif
 }
diff --git a/libcxx/test/utilities/utility/forward/move_if_noexcept.pass.cpp b/libcxx/test/utilities/utility/forward/move_if_noexcept.pass.cpp
index 8a0eba012a8..4a07467b99f 100644
--- a/libcxx/test/utilities/utility/forward/move_if_noexcept.pass.cpp
+++ b/libcxx/test/utilities/utility/forward/move_if_noexcept.pass.cpp
@@ -60,4 +60,10 @@ int main()
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
     static_assert((std::is_same<decltype(std::move_if_noexcept(l)), const legacy&>::value), "");
 
+#if _LIBCPP_STD_VER > 11
+	constexpr int i1 = 23;
+	constexpr int i2 = std::move_if_noexcept(i1);
+	static_assert(i2 == 23, "" );
+#endif
+
 }