Skip to content

Commit 6334296

Browse files
kazutakahiratagithub-actions[bot]
authored andcommitted
Automerge: Revert "[ASan] Ensure Symbolize Flag setting on Windows through __asan_default_options() is maintained throughout runtime (#132811)"
This reverts commit 7bf43fe. Multiple buildbot failures have been reported: llvm/llvm-project#132811
2 parents 24d0ab4 + 2344f82 commit 6334296

File tree

4 files changed

+0
-52
lines changed

4 files changed

+0
-52
lines changed

compiler-rt/lib/asan/asan_flags.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,6 @@ void InitializeFlags() {
241241
InitializeDefaultFlags();
242242
ProcessFlags();
243243
ApplyFlags();
244-
if (!common_flags()->symbolize)
245-
Symbolizer::ClearTools();
246244
});
247245

248246
# if CAN_SANITIZE_UB

compiler-rt/lib/sanitizer_common/sanitizer_symbolizer.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,6 @@ class Symbolizer final {
136136
/// (if it wasn't already initialized).
137137
static Symbolizer *GetOrInit();
138138
static void LateInitialize();
139-
static void ClearTools();
140-
141139
// Returns a list of symbolized frames for a given address (containing
142140
// all inlined functions, if necessary).
143141
SymbolizedStack *SymbolizePC(uptr address);

compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_libcdep.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,6 @@ Symbolizer *Symbolizer::GetOrInit() {
2626
return symbolizer_;
2727
}
2828

29-
// If the 'symbolize' flag is set to 0, it clears the tools
30-
// associated with the symbolizer to prevent unnecessary symbolization and
31-
// resource usage. This is necessary because of the late binding of the
32-
// overridden method, __asan_default_options().
33-
void Symbolizer::ClearTools() {
34-
SpinMutexLock l(&init_mu_);
35-
if (symbolizer_)
36-
symbolizer_->tools_.clear();
37-
}
38-
3929
// See sanitizer_symbolizer_markup.cpp.
4030
#if !SANITIZER_SYMBOLIZER_MARKUP
4131

compiler-rt/test/asan/TestCases/Windows/symbolize.cpp

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)