zturner created this revision. zturner added reviewers: JDevlieghere, aprantl. Herald added a subscriber: jdoerfert.
I don't find these specific log statements particularly high value, as they appear more just like simple function tracing calls (i.e. they log low level implementation details, not high level program flow) so I'm removing them from the low level DWARF parsing libraries. I'm prepared to be convinced that we actually should do something other than outright delete them, but I did look at each one specifically as well as the surrounding context before deciding that they were probably ok to delete. My reasoning for deleting these is that they are all on the success codepath and have a very limited number of call-sites (in most cases actually just 1), so in most cases a previous log statement would necessarily be followed by the deleted log statement, so therefore it doesn't actually add much (if any) diagnostic value. https://reviews.llvm.org/D59498 Files: lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp
Index: lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp =================================================================== --- lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp +++ lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp @@ -165,15 +165,6 @@ DWARFDebugInfoEntry die; // Keep a flat array of the DIE for binary lookup by DIE offset - Log *log( - LogChannelDWARF::GetLogIfAny(DWARF_LOG_DEBUG_INFO | DWARF_LOG_LOOKUPS)); - if (log) { - m_dwarf->GetObjectFile()->GetModule()->LogMessageVerboseBacktrace( - log, - "DWARFUnit::ExtractDIEsIfNeeded () for compile unit at " - ".debug_info[0x%8.8x]", - GetOffset()); - } uint32_t depth = 0; // We are in our compile unit, parse starting at the offset we were told to @@ -834,15 +825,6 @@ const DWARFDebugAranges &DWARFUnit::GetFunctionAranges() { if (m_func_aranges_up == NULL) { m_func_aranges_up.reset(new DWARFDebugAranges()); - Log *log(LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_ARANGES)); - - if (log) { - m_dwarf->GetObjectFile()->GetModule()->LogMessage( - log, - "DWARFUnit::GetFunctionAranges() for compile unit at " - ".debug_info[0x%8.8x]", - GetOffset()); - } const DWARFDebugInfoEntry *die = DIEPtr(); if (die) die->BuildFunctionAddressRangeTable(m_dwarf, this, Index: lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp =================================================================== --- lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp +++ lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp @@ -22,7 +22,6 @@ #include "DWARFDebugInfo.h" #include "DWARFDebugInfoEntry.h" #include "DWARFFormValue.h" -#include "LogChannelDWARF.h" using namespace lldb; using namespace lldb_private; @@ -48,17 +47,10 @@ assert(m_dwarf2Data); - Log *log(LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_ARANGES)); - m_cu_aranges_up = llvm::make_unique<DWARFDebugAranges>(); const DWARFDataExtractor &debug_aranges_data = m_dwarf2Data->get_debug_aranges_data(); if (debug_aranges_data.GetByteSize() > 0) { - if (log) - log->Printf( - "DWARFDebugInfo::GetCompileUnitAranges() for \"%s\" from " - ".debug_aranges", - m_dwarf2Data->GetObjectFile()->GetFileSpec().GetPath().c_str()); llvm::Error error = m_cu_aranges_up->extract(debug_aranges_data); if (error) return std::move(error); @@ -74,22 +66,13 @@ // Manually build arange data for everything that wasn't in the // .debug_aranges table. - bool printed = false; const size_t num_compile_units = GetNumCompileUnits(); for (size_t idx = 0; idx < num_compile_units; ++idx) { DWARFUnit *cu = GetCompileUnitAtIndex(idx); dw_offset_t offset = cu->GetOffset(); - if (cus_with_data.find(offset) == cus_with_data.end()) { - if (log) { - if (!printed) - log->Printf( - "DWARFDebugInfo::GetCompileUnitAranges() for \"%s\" by parsing", - m_dwarf2Data->GetObjectFile()->GetFileSpec().GetPath().c_str()); - printed = true; - } + if (cus_with_data.find(offset) == cus_with_data.end()) cu->BuildAddressRangeTable(m_dwarf2Data, m_cu_aranges_up.get()); - } } const bool minimize = true; Index: lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp =================================================================== --- lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp +++ lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp @@ -13,13 +13,11 @@ #include <algorithm> -#include "lldb/Utility/Log.h" #include "lldb/Utility/Stream.h" #include "lldb/Utility/Timer.h" #include "DWARFUnit.h" #include "DWARFDebugInfo.h" -#include "LogChannelDWARF.h" #include "SymbolFileDWARF.h" using namespace lldb; @@ -118,30 +116,8 @@ Timer scoped_timer(func_cat, "%s this = %p", LLVM_PRETTY_FUNCTION, static_cast<void *>(this)); - Log *log(LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_ARANGES)); - size_t orig_arange_size = 0; - if (log) { - orig_arange_size = m_aranges.GetSize(); - log->Printf("DWARFDebugAranges::Sort(minimize = %u) with %" PRIu64 - " entries", - minimize, (uint64_t)orig_arange_size); - } - m_aranges.Sort(); m_aranges.CombineConsecutiveEntriesWithEqualData(); - - if (log) { - if (minimize) { - const size_t new_arange_size = m_aranges.GetSize(); - const size_t delta = orig_arange_size - new_arange_size; - log->Printf("DWARFDebugAranges::Sort() %" PRIu64 - " entries after minimizing (%" PRIu64 - " entries combined for %" PRIu64 " bytes saved)", - (uint64_t)new_arange_size, (uint64_t)delta, - (uint64_t)delta * sizeof(Range)); - } - Dump(log); - } } //----------------------------------------------------------------------
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits