This is an archive of the discontinued LLVM Phabricator instance.

Differential D143299

[libc++] Reorganize exception_guard
ClosedPublic

Authored by ldionne on Feb 3 2023, 3:03 PM.

Details

Reviewers
jloser
Mordante
Group Reviewers
Restricted Project
Commits
rG201b2b5674e1: [libc++] Reorganize exception_guard
Summary

We try to keep as little code as possible within #ifdef.

Diff Detail

Event Timeline

ldionne created this revision.Feb 3 2023, 3:03 PM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 3 2023, 3:03 PM
ldionne requested review of this revision.Feb 3 2023, 3:03 PM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 3 2023, 3:03 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B211812: Diff 494749.Feb 3 2023, 4:26 PM
jloser accepted this revision.Feb 3 2023, 6:24 PM
jloser added a subscriber: jloser.

LGTM!

Mordante accepted this revision.Feb 5 2023, 3:49 AM
Mordante added a subscriber: Mordante.

LGTM!

This revision is now accepted and ready to land.Feb 5 2023, 3:49 AM
This revision was landed with ongoing or failed builds.Feb 13 2023, 8:50 AM
Closed by commit rG201b2b5674e1: [libc++] Reorganize exception_guard (authored by ldionne). · Explain Why
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rG201b2b5674e1: [libc++] Reorganize exception_guard.

Revision Contents

PathSize
libcxx/
include/
__utility/
10 lines

Diff 497010

libcxx/include/__utility/exception_guard.h

Show First 20 Lines • Show All 52 Lines • ▼ Show 20 Lines
// for (; n > 0; ++iter, ++out, --n) { // for (; n > 0; ++iter, ++out, --n) {
// ::new ((void*)std::addressof(*out)) value_type(*iter); // ::new ((void*)std::addressof(*out)) value_type(*iter);
// } // }
// guard.__complete(); // guard.__complete();
// return out; // return out;
// } // }
// //
#ifndef _LIBCPP_NO_EXCEPTIONS
template <class _Rollback> template <class _Rollback>
struct __exception_guard_exceptions { struct __exception_guard_exceptions {
__exception_guard_exceptions() = delete; __exception_guard_exceptions() = delete;
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit __exception_guard_exceptions(_Rollback __rollback) _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit __exception_guard_exceptions(_Rollback __rollback)
: __rollback_(std::move(__rollback)), __completed_(false) {} : __rollback_(std::move(__rollback)), __completed_(false) {}
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
Show All 17 Lines
private: private:
_Rollback __rollback_; _Rollback __rollback_;
bool __completed_; bool __completed_;
}; };
_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(__exception_guard_exceptions); _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(__exception_guard_exceptions);
template <class _Rollback> template <class _Rollback>
using __exception_guard = __exception_guard_exceptions<_Rollback>;
#else // _LIBCPP_NO_EXCEPTIONS
template <class _Rollback>
struct __exception_guard_noexceptions { struct __exception_guard_noexceptions {
__exception_guard_noexceptions() = delete; __exception_guard_noexceptions() = delete;
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
_LIBCPP_NODEBUG explicit __exception_guard_noexceptions(_Rollback) {} _LIBCPP_NODEBUG explicit __exception_guard_noexceptions(_Rollback) {}
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_NODEBUG _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_NODEBUG
__exception_guard_noexceptions(__exception_guard_noexceptions&& __other) __exception_guard_noexceptions(__exception_guard_noexceptions&& __other)
_NOEXCEPT_(is_nothrow_move_constructible<_Rollback>::value) _NOEXCEPT_(is_nothrow_move_constructible<_Rollback>::value)
Show All 14 Linesstruct __exception_guard_noexceptions {
} }
private: private:
bool __completed_ = false; bool __completed_ = false;
}; };
_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(__exception_guard_noexceptions); _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(__exception_guard_noexceptions);
#ifdef _LIBCPP_NO_EXCEPTIONS
template <class _Rollback> template <class _Rollback>
using __exception_guard = __exception_guard_noexceptions<_Rollback>; using __exception_guard = __exception_guard_noexceptions<_Rollback>;
#endif // _LIBCPP_NO_EXCEPTIONS #else
template <class _Rollback>
using __exception_guard = __exception_guard_exceptions<_Rollback>;
#endif
template <class _Rollback> template <class _Rollback>
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR __exception_guard<_Rollback> __make_exception_guard(_Rollback __rollback) { _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR __exception_guard<_Rollback> __make_exception_guard(_Rollback __rollback) {
return __exception_guard<_Rollback>(std::move(__rollback)); return __exception_guard<_Rollback>(std::move(__rollback));
} }
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP___UTILITY_TRANSACTION_H #endif // _LIBCPP___UTILITY_TRANSACTION_H