From 2e18897fc38db7f0fa8d2370318182cb41f73991 Mon Sep 17 00:00:00 2001 From: Michael Buch Date: Fri, 12 Dec 2025 16:08:13 +0000 Subject: [PATCH] [lldb][InstrumentationRuntime] Run sanitizer utility expressions as C (#172019) The utility expressions in the `InstrumentationRuntime` plugins are just plain C code, but we run them as `ObjC++`. That meant we were doing redundant work (like looking up decls in the Objective-C runtime). The sanitizer tests sporadically time out while looking up function symbols in the Objective-C runtime. This patch switches the expression language to `C`. Didn't find a great way of testing this other than looking at the expression log. rdar://165656320 (cherry picked from commit d7cbc7f9e465344dd326eaf6e5a6cfa90285ce8e) --- .../InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp | 2 +- .../UBSan/InstrumentationRuntimeUBSan.cpp | 2 +- .../Plugins/InstrumentationRuntime/Utility/ReportRetriever.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp b/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp index f12c0f773e898..8886890736e9e 100644 --- a/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp +++ b/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp @@ -325,7 +325,7 @@ StructuredData::ObjectSP InstrumentationRuntimeTSan::RetrieveReportData( options.SetTimeout(process_sp->GetUtilityExpressionTimeout()); options.SetPrefix(thread_sanitizer_retrieve_report_data_prefix); options.SetAutoApplyFixIts(false); - options.SetLanguage(eLanguageTypeObjC_plus_plus); + options.SetLanguage(eLanguageTypeC); ValueObjectSP main_value; ExecutionContext exe_ctx; diff --git a/lldb/source/Plugins/InstrumentationRuntime/UBSan/InstrumentationRuntimeUBSan.cpp b/lldb/source/Plugins/InstrumentationRuntime/UBSan/InstrumentationRuntimeUBSan.cpp index c2db3540a797b..a7ab2d25b70bf 100644 --- a/lldb/source/Plugins/InstrumentationRuntime/UBSan/InstrumentationRuntimeUBSan.cpp +++ b/lldb/source/Plugins/InstrumentationRuntime/UBSan/InstrumentationRuntimeUBSan.cpp @@ -124,7 +124,7 @@ StructuredData::ObjectSP InstrumentationRuntimeUBSan::RetrieveReportData( options.SetTimeout(process_sp->GetUtilityExpressionTimeout()); options.SetPrefix(ub_sanitizer_retrieve_report_data_prefix); options.SetAutoApplyFixIts(false); - options.SetLanguage(eLanguageTypeObjC_plus_plus); + options.SetLanguage(eLanguageTypeC); ValueObjectSP main_value; ExecutionContext exe_ctx; diff --git a/lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.cpp b/lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.cpp index c4c5be79797f3..2ead18d912b02 100644 --- a/lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.cpp +++ b/lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.cpp @@ -81,7 +81,7 @@ ReportRetriever::RetrieveReportData(const ProcessSP process_sp) { options.SetTimeout(process_sp->GetUtilityExpressionTimeout()); options.SetPrefix(address_sanitizer_retrieve_report_data_prefix); options.SetAutoApplyFixIts(false); - options.SetLanguage(eLanguageTypeObjC_plus_plus); + options.SetLanguage(eLanguageTypeC); if (auto m = GetPreferredAsanModule(process_sp->GetTarget())) { SymbolContextList sc_list;