Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

<optional>: Fix exception specification for optional's transform-construction #3668

Merged
merged 9 commits into from
Apr 28, 2023
Merged

<optional>: Fix exception specification for optional's transform-construction #3668

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
38e7bf9
Fix exception specification for transform-construction of `optional`
frederick-vs-ja Apr 24, 2023
83022ea
Add test coverage
frederick-vs-ja Apr 24, 2023
fa13be6
Include `<exception>` for `exception`
frederick-vs-ja Apr 24, 2023
43e9019
Clang-format
frederick-vs-ja Apr 24, 2023
ff46f66
Missed replacing!
frederick-vs-ja Apr 24, 2023
2761494
Handle warning C4702
frederick-vs-ja Apr 24, 2023
7075dd9
Adopt @cpplearner's review comments
frederick-vs-ja Apr 24, 2023
94df21e
Nitpicks: Add underscore and comment.
StephanTLavavej Apr 24, 2023
8bbf980
Test both trivial and non-trivial dtors.
StephanTLavavej Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions stl/inc/optional
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ struct _Optional_destruct_base { // either contains a value of _Ty or is empty (
#if _HAS_CXX23
template <class _Fn, class _Ux>
constexpr _Optional_destruct_base(_Construct_from_invoke_result_tag, _Fn&& _Func, _Ux&& _Arg) noexcept(
is_nothrow_constructible_v<_Ty, invoke_result_t<_Fn, _Ux>>)
noexcept(static_cast<_Ty>(_STD invoke(_STD forward<_Fn>(_Func), _STD forward<_Ux>(_Arg)))))
: _Value(_STD invoke(_STD forward<_Fn>(_Func), _STD forward<_Ux>(_Arg))), _Has_value{true} {}
#endif // _HAS_CXX23

Expand Down Expand Up @@ -118,7 +118,7 @@ struct _Optional_destruct_base<_Ty, false> { // either contains a value of _Ty o
#if _HAS_CXX23
template <class _Fn, class _Ux>
constexpr _Optional_destruct_base(_Construct_from_invoke_result_tag, _Fn&& _Func, _Ux&& _Arg) noexcept(
is_nothrow_constructible_v<_Ty, invoke_result_t<_Fn, _Ux>>)
noexcept(static_cast<_Ty>(_STD invoke(_STD forward<_Fn>(_Func), _STD forward<_Ux>(_Arg)))))
: _Value(_STD invoke(_STD forward<_Fn>(_Func), _STD forward<_Ux>(_Arg))), _Has_value{true} {}
#endif // _HAS_CXX23

Expand Down Expand Up @@ -277,7 +277,7 @@ public:
#if _HAS_CXX23
template <class _Fn, class _Ux>
constexpr optional(_Construct_from_invoke_result_tag _Tag, _Fn&& _Func, _Ux&& _Arg) noexcept(
is_nothrow_constructible_v<_Ty, invoke_result_t<_Fn, _Ux>>)
noexcept(static_cast<_Ty>(_STD invoke(_STD forward<_Fn>(_Func), _STD forward<_Ux>(_Arg)))))
: _Mybase(_Tag, _STD forward<_Fn>(_Func), _STD forward<_Ux>(_Arg)) {}
#endif // _HAS_CXX23

Expand Down
17 changes: 17 additions & 0 deletions tests/std/tests/P0798R8_monadic_operations_for_std_optional/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <cassert>
#include <exception>
#include <optional>
#include <type_traits>
#include <utility>
Expand Down Expand Up @@ -109,7 +110,23 @@ constexpr bool test() {
return true;
}

void test_gh3667() {
StephanTLavavej marked this conversation as resolved.
Show resolved Hide resolved
class unique_exception : public exception {};

try {
optional<int> opt(1);
opt.transform([](int) -> int { throw unique_exception{}; });
StephanTLavavej marked this conversation as resolved.
Show resolved Hide resolved
} catch (const unique_exception&) {
return;
} catch (...) {
assert(false); // shouldn't terminate or reach here
}
assert(false); // shouldn't terminate or reach here
}

int main() {
test();
static_assert(test());

test_gh3667();
}