Use std::swap, mark T& assignment and __swap noexcept

smallp-o-p · smallp-o-p · commit 65e92c481d1a · 2025-10-31T16:35:01.000-04:00
diff --git a/libcxx/include/optional b/libcxx/include/optional
@@ -476,13 +476,12 @@ struct __optional_storage_base<_Tp, true> {
   }
 
   template <class _Up>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __assign_from_val(_Up&& __val) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __assign_from_val(_Up&& __val) noexcept {
     __value_ = std::addressof(__val);
   }
 
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __swap(__optional_storage_base& __rhs) {
-    using std::swap;
-    swap(__value_, __rhs.__value_);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __swap(__optional_storage_base& __rhs) noexcept {
+    std::swap(__value_, __rhs.__value_);
   }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -476,13 +476,12 @@ struct __optional_storage_base<_Tp, true> {`
`476`	`476`	`}`
`477`	`477`
`478`	`478`	`template <class _Up>`
`479`		`- _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __assign_from_val(_Up&& __val) {`
	`479`	`+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __assign_from_val(_Up&& __val) noexcept {`
`480`	`480`	`__value_ = std::addressof(__val);`
`481`	`481`	`}`
`482`	`482`
`483`		`- _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __swap(__optional_storage_base& __rhs) {`
`484`		`- using std::swap;`
`485`		`- swap(__value_, __rhs.__value_);`
	`483`	`+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __swap(__optional_storage_base& __rhs) noexcept {`
	`484`	`+ std::swap(__value_, __rhs.__value_);`
`486`	`485`	`}`
`487`	`486`	`};`
`488`	`487`