Skip to content

Commit 42e707b

Browse files
committed
[libc++] Removes the _LIBCPP_VERBOSE_ABORT_NOT_NOEXCEPT macro.
This makes __libcpp_verbose_abort unconditionally noexcept. This was planned for the upcomming release.
1 parent d39d24c commit 42e707b

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

libcxx/docs/ReleaseNotes/21.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ Deprecations and Removals
7070

7171
- ``std::is_trivial`` and ``std::is_trivial_v`` are deprecated in C++26 and later.
7272

73+
- The ``_LIBCPP_VERBOSE_ABORT_NOT_NOEXCEPT`` has been removed, making ``std::__libcpp_verbose_abort``
74+
unconditionally ``noexcept``.
75+
7376
Potentially breaking changes
7477
----------------------------
7578

@@ -91,9 +94,6 @@ LLVM 21
9194
If you are using C++03 in your project, you should consider moving to a newer version of the Standard to get the most
9295
out of libc++.
9396

94-
- The ``_LIBCPP_VERBOSE_ABORT_NOT_NOEXCEPT`` macro will be removed in LLVM 21, making ``std::__libcpp_verbose_abort``
95-
unconditionally ``noexcept``.
96-
9797
- Non-conforming extension ``packaged_task::result_type`` will be removed in LLVM 21.
9898

9999
LLVM 22

libcxx/include/__verbose_abort

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,10 @@
1818

1919
_LIBCPP_BEGIN_NAMESPACE_STD
2020

21-
#if defined(_LIBCPP_VERBOSE_ABORT_NOT_NOEXCEPT)
22-
# define _LIBCPP_VERBOSE_ABORT_NOEXCEPT
23-
#else
24-
# define _LIBCPP_VERBOSE_ABORT_NOEXCEPT _NOEXCEPT
25-
#endif
26-
2721
// This function should never be called directly from the code -- it should only be called through
2822
// the _LIBCPP_VERBOSE_ABORT macro.
2923
[[__noreturn__]] _LIBCPP_AVAILABILITY_VERBOSE_ABORT _LIBCPP_OVERRIDABLE_FUNC_VIS _LIBCPP_ATTRIBUTE_FORMAT(
30-
__printf__, 1, 2) void __libcpp_verbose_abort(const char* __format, ...) _LIBCPP_VERBOSE_ABORT_NOEXCEPT;
24+
__printf__, 1, 2) void __libcpp_verbose_abort(const char* __format, ...) _NOEXCEPT;
3125

3226
// _LIBCPP_VERBOSE_ABORT(format, args...)
3327
//

0 commit comments

Comments
 (0)