[libc++] Don't add reference to system_category when exceptions disabled #67504
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fixes a size regression in Fuchsia when building a static libc++ multilib with exceptions disabled. Referring to system_category in __throw_system_error brings in a relatively large amount of additional exception classes into the link without substantially improving the error message.
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx ChangesThis fixes a size regression in Fuchsia when building a static libc++ multilib with exceptions disabled. Referring to system_category in __throw_system_error brings in a relatively large amount of additional exception classes into the link without substantially improving the error message. Full diff: https://github.com/llvm/llvm-project/pull/67504.diff 1 Files Affected:
diff --git a/libcxx/src/system_error.cpp b/libcxx/src/system_error.cpp
index f187090f75b6ce9..5b6601bad78531d 100644
--- a/libcxx/src/system_error.cpp
+++ b/libcxx/src/system_error.cpp
@@ -266,8 +266,16 @@ 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
|
legrosbuffle
pushed a commit
to legrosbuffle/llvm-project
that referenced
this pull request
Sep 29, 2023
…led (llvm#67504) This fixes a size regression in Fuchsia when building a static libc++ multilib with exceptions disabled. Referring to `system_category` in `__throw_system_error` brings in a relatively large amount of additional exception classes into the link without substantially improving the error message.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes a size regression in Fuchsia when building a static libc++ multilib with exceptions disabled. Referring to
system_categoryin__throw_system_errorbrings in a relatively large amount of additional exception classes into the link without substantially improving the error message.