[compiler-rt][nsan] Update UnwindImpl #107313
Merged
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
alexander-shaposhnikov
changed the title
|
@llvm/pr-subscribers-compiler-rt-sanitizer Author: Alexander Shaposhnikov (alexander-shaposhnikov) ChangesImplement __sanitizer::BufferedStackTrace::UnwindImpl following msan. Full diff: https://github.com/llvm/llvm-project/pull/107313.diff 1 Files Affected:
diff --git a/compiler-rt/lib/nsan/nsan.cpp b/compiler-rt/lib/nsan/nsan.cpp
index 4be9c673bd4e00..c2e7690e12ab10 100644
--- a/compiler-rt/lib/nsan/nsan.cpp
+++ b/compiler-rt/lib/nsan/nsan.cpp
@@ -195,12 +195,19 @@ template <typename T> T max(T a, T b) { return a < b ? b : a; }
} // end anonymous namespace
-void __sanitizer::BufferedStackTrace::UnwindImpl(uptr pc, uptr bp,
- void *context,
- bool request_fast,
- u32 max_depth) {
- using namespace __nsan;
- return Unwind(max_depth, pc, bp, context, 0, 0, false);
+void __sanitizer::BufferedStackTrace::UnwindImpl(
+ uptr pc, uptr bp, void *context, bool request_fast, u32 max_depth) {
+ using namespace __msan;
+ NsanThread *t = GetCurrentThread();
+ if (!t || !StackTrace::WillUseFastUnwind(request_fast)) {
+ // Block reports from our interceptors during _Unwind_Backtrace.
+ return Unwind(max_depth, pc, bp, context, t ? t->stack_top() : 0,
+ t ? t->stack_bottom() : 0, false);
+ }
+ if (StackTrace::WillUseFastUnwind(request_fast))
+ Unwind(max_depth, pc, bp, nullptr, t->stack_top(), t->stack_bottom(), true);
+ else
+ Unwind(max_depth, pc, 0, context, 0, 0, false);
}
extern "C" SANITIZER_INTERFACE_ATTRIBUTE void __nsan_print_accumulated_stats() {
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
alexander-shaposhnikov
force-pushed
the
update_unwind
branch
from
1c0558e to
eecdb01
Compare
vitalybuka
approved these changes
Sep 4, 2024
alexander-shaposhnikov
force-pushed
the
update_unwind
branch
from
eecdb01 to
b232bdb
Compare
…l following msan's example
alexander-shaposhnikov
force-pushed
the
update_unwind
branch
from
b232bdb to
5251ae2
Compare
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/66/builds/3488 Here is the relevant piece of the build log for the reference |
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.
Implement __sanitizer::BufferedStackTrace::UnwindImpl following msan.