Skip to content

Commit b1bff20

Browse files
committed
fixup! only ASAN for now
1 parent f75b908 commit b1bff20

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ ReportRetriever::RetrieveReportData(const ProcessSP process_sp) {
8383
options.SetAutoApplyFixIts(false);
8484
options.SetLanguage(eLanguageTypeObjC_plus_plus);
8585

86-
if (auto m = GetPreferredSanitizerModule(process_sp->GetTarget())) {
86+
if (auto m = GetPreferredAsanModule(process_sp->GetTarget())) {
8787
SymbolContextList sc_list;
8888
sc_list.Append(SymbolContext(std::move(m)));
8989
options.SetPreferredSymbolContexts(std::move(sc_list));

lldb/source/Plugins/InstrumentationRuntime/Utility/Utility.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ namespace lldb_private {
1717
///< compiler-rt, and we should prefer it in favour of the system sanitizers.
1818
///< This helper searches the target for such a dylib. Returns nullptr if no
1919
///< such dylib was found.
20-
lldb::ModuleSP GetPreferredSanitizerModule(const Target &target) {
20+
lldb::ModuleSP GetPreferredAsanModule(const Target &target) {
2121
lldb::ModuleSP module;
22-
llvm::Regex pattern(R"(libclang_rt\.(asan|tsan|ubsan)_.*_dynamic\.dylib)");
22+
llvm::Regex pattern(R"(libclang_rt\.asan_.*_dynamic\.dylib)");
2323
target.GetImages().ForEach([&](const lldb::ModuleSP &m) {
2424
if (pattern.match(m->GetFileSpec().GetFilename().GetStringRef())) {
2525
module = m;

lldb/source/Plugins/InstrumentationRuntime/Utility/Utility.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Target;
2020
///< when running InstrumentationRuntime utility expressions that use symbols
2121
///< from the sanitizer libraries. This helper searches the target for such a
2222
///< dylib. Returns nullptr if no such dylib was found.
23-
lldb::ModuleSP GetPreferredSanitizerModule(const Target &target);
23+
lldb::ModuleSP GetPreferredAsanModule(const Target &target);
2424

2525
} // namespace lldb_private
2626

lldb/source/Plugins/MemoryHistory/asan/MemoryHistoryASan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ HistoryThreads MemoryHistoryASan::GetHistoryThreads(lldb::addr_t address) {
176176
options.SetAutoApplyFixIts(false);
177177
options.SetLanguage(eLanguageTypeObjC_plus_plus);
178178

179-
if (auto m = GetPreferredSanitizerModule(process_sp->GetTarget())) {
179+
if (auto m = GetPreferredAsanModule(process_sp->GetTarget())) {
180180
SymbolContextList sc_list;
181181
sc_list.Append(SymbolContext(std::move(m)));
182182
options.SetPreferredSymbolContexts(std::move(sc_list));

0 commit comments

Comments
 (0)