Author: Michael Buch Date: 2025-03-10T11:37:13Z New Revision: 6a9df5b4dd2ac1b00cdc3880c210cc0d2e917f04
URL: https://github.com/llvm/llvm-project/commit/6a9df5b4dd2ac1b00cdc3880c210cc0d2e917f04 DIFF: https://github.com/llvm/llvm-project/commit/6a9df5b4dd2ac1b00cdc3880c210cc0d2e917f04.diff LOG: Revert "[lldb][asan] Add temporary logging to ReportRetriever" This reverts commit 39a4da20d88d797824f0e7be0f732ccaf0c7eee4. We skipped the failing tests in `6cc8b0bef07f4270303bec0fc203f251a2fde262`. Added: Modified: lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.cpp lldb/test/API/functionalities/asan/TestReportData.py Removed: ################################################################################ diff --git a/lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.cpp b/lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.cpp index 006d8aa9b4dbe..96489248022eb 100644 --- a/lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.cpp +++ b/lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.cpp @@ -14,7 +14,6 @@ #include "lldb/Core/Module.h" #include "lldb/Expression/UserExpression.h" #include "lldb/Target/InstrumentationRuntimeStopInfo.h" -#include "lldb/Utility/LLDBLog.h" #include "lldb/ValueObject/ValueObject.h" using namespace lldb; @@ -85,8 +84,6 @@ ReportRetriever::RetrieveReportData(const ProcessSP process_sp) { options.SetLanguage(eLanguageTypeObjC_plus_plus); if (auto m = GetPreferredAsanModule(process_sp->GetTarget())) { - LLDB_LOGF(GetLog(LLDBLog::Expressions), "Using preferred ASAN module: %s", - m->GetFileSpec().GetFilename().AsCString("")); SymbolContextList sc_list; sc_list.Append(SymbolContext(std::move(m))); options.SetPreferredSymbolContexts(std::move(sc_list)); @@ -108,16 +105,11 @@ ReportRetriever::RetrieveReportData(const ProcessSP process_sp) { return StructuredData::ObjectSP(); } - LLDB_LOGF(GetLog(LLDBLog::Expressions), - "Successfully ran ASAN report retriever utility expression"); - int present = return_value_sp->GetValueForExpressionPath(".present") ->GetValueAsUnsigned(0); if (present != 1) return StructuredData::ObjectSP(); - LLDB_LOGF(GetLog(LLDBLog::Expressions), "Retrieving report.1"); - addr_t pc = return_value_sp->GetValueForExpressionPath(".pc")->GetValueAsUnsigned(0); addr_t bp = @@ -143,8 +135,6 @@ ReportRetriever::RetrieveReportData(const ProcessSP process_sp) { if (!dict) return StructuredData::ObjectSP(); - LLDB_LOGF(GetLog(LLDBLog::Expressions), "Retrieving report.2"); - dict->AddStringItem("instrumentation_class", "AddressSanitizer"); dict->AddStringItem("stop_type", "fatal_error"); dict->AddIntegerItem("pc", pc); diff --git a/lldb/test/API/functionalities/asan/TestReportData.py b/lldb/test/API/functionalities/asan/TestReportData.py index 3319677be9b51..fabc985d0ed44 100644 --- a/lldb/test/API/functionalities/asan/TestReportData.py +++ b/lldb/test/API/functionalities/asan/TestReportData.py @@ -39,9 +39,6 @@ def setUp(self): self.col_crash = 16 def asan_tests(self, libsanitizers=False): - if libsanitizers: - self.runCmd("log enable lldb expr") - target = self.createTestTarget() if libsanitizers: _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
