implicit bool conversions are evil

smallp-o-p · smallp-o-p · commit f782e10c8653 · 2025-07-21T19:53:48.000-04:00
diff --git a/libcxx/include/optional b/libcxx/include/optional
@@ -837,8 +837,8 @@ public:
     return const_iterator(std::addressof(this->__get()));
   }
 
-  _LIBCPP_HIDE_FROM_ABI constexpr iterator end() noexcept { return begin() + this->has_value(); }
-  _LIBCPP_HIDE_FROM_ABI constexpr const_iterator end() const noexcept { return begin() + this->has_value(); }
+  _LIBCPP_HIDE_FROM_ABI constexpr iterator end() noexcept { return begin() + (this->has_value() ? 1 : 0); }
+  _LIBCPP_HIDE_FROM_ABI constexpr const_iterator end() const noexcept { return begin() + (this->has_value() ? 1 : 0); }
 #    endif
 
   _LIBCPP_HIDE_FROM_ABI constexpr add_pointer_t<value_type const> operator->() const noexcept {

Original file line number	Diff line number	Diff line change
`@@ -837,8 +837,8 @@ public:`
`837`	`837`	`return const_iterator(std::addressof(this->__get()));`
`838`	`838`	`}`
`839`	`839`
`840`		`- _LIBCPP_HIDE_FROM_ABI constexpr iterator end() noexcept { return begin() + this->has_value(); }`
`841`		`- _LIBCPP_HIDE_FROM_ABI constexpr const_iterator end() const noexcept { return begin() + this->has_value(); }`
	`840`	`+ _LIBCPP_HIDE_FROM_ABI constexpr iterator end() noexcept { return begin() + (this->has_value() ? 1 : 0); }`
	`841`	`+ _LIBCPP_HIDE_FROM_ABI constexpr const_iterator end() const noexcept { return begin() + (this->has_value() ? 1 : 0); }`
`842`	`842`	`# endif`
`843`	`843`
`844`	`844`	`_LIBCPP_HIDE_FROM_ABI constexpr add_pointer_t<value_type const> operator->() const noexcept {`