[libc++][hardening] Use __builtin_verbose_trap if it's available.
#84870
Conversation
This file contains 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
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx Author: Konstantin Varlamov (var-const) ChangesKeep falling back to Full diff: https://github.com/llvm/llvm-project/pull/84870.diff 1 Files Affected:
diff --git a/libcxx/vendor/llvm/default_assertion_handler.in b/libcxx/vendor/llvm/default_assertion_handler.in
index 8bc0553c078b34..8b892ff7b565eb 100644
--- a/libcxx/vendor/llvm/default_assertion_handler.in
+++ b/libcxx/vendor/llvm/default_assertion_handler.in
@@ -23,8 +23,11 @@
#else
-// TODO(hardening): use `__builtin_verbose_trap(message)` once that becomes available.
-# define _LIBCPP_ASSERTION_HANDLER(message) ((void)message, __builtin_trap())
+# if __has_builtin(__builtin_verbose_trap)
+# define _LIBCPP_ASSERTION_HANDLER(message) (__builtin_verbose_trap(message))
+# else
+# define _LIBCPP_ASSERTION_HANDLER(message) ((void)message, __builtin_trap())
+# endif
#endif // _LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_DEBUG
|
|
Depends on #79230. |
ldionne
approved these changes
Mar 12, 2024
Keep falling back to `__builtin_trap` on older versions of Clang.
ldionne
changed the title
__builtin_verbose_trap if it's available.__builtin_verbose_trap if it's available.
ldionne
force-pushed
the
varconst/use-verbose-trap
branch
from
b48f4ed
to
ea44fac
Compare
|
Rebase to trigger CI. This can be merged once CI is green. |
|
The CI failure is a fluke, merging. |
aaryanshukla
pushed a commit
to aaryanshukla/llvm-project
that referenced
this pull request
Jul 14, 2024
…lvm#84870) Keep falling back to `__builtin_trap` on older versions of Clang. Co-authored-by: Louis Dionne <[email protected]>
aaryanshukla
pushed a commit
to aaryanshukla/llvm-project
that referenced
this pull request
Jul 16, 2024
…lvm#84870) Keep falling back to `__builtin_trap` on older versions of Clang. Co-authored-by: Louis Dionne <[email protected]>
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.
Keep falling back to
__builtin_trapon older versions of Clang.