Skip to content

[libc++] Don't add reference to system_category when exceptions disabled #67504

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

Merged
merged 2 commits into from
Sep 27, 2023
Merged

[libc++] Don't add reference to system_category when exceptions disabled #67504

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5673138
[libc++] Don't add reference to system_category when exceptions disabled
mysterymath Sep 25, 2023
f93246a
Formatting
mysterymath Sep 27, 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
11 changes: 9 additions & 2 deletions libcxx/src/system_error.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,15 @@ system_error::~system_error() noexcept
{
}

void __throw_system_error(int ev, const char* what_arg) {
std::__throw_system_error(error_code(ev, system_category()), what_arg);
void
__throw_system_error(int ev, const char* what_arg)
{
#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
std::__throw_system_error(error_code(ev, system_category()), what_arg);
#else
// The above could also handle the no-exception case, but for size, avoid referencing system_category() unnecessarily.
_LIBCPP_VERBOSE_ABORT("system_error was thrown in -fno-exceptions mode with error %i and message \"%s\"", ev, what_arg);
#endif
}

_LIBCPP_END_NAMESPACE_STD