Fixed an issue where a lexical block or inlined function might have bad debug
information generated for it. Say we have a concrete function "foo" which
has inlined function "a" which calls another inlined function "b":
foo
1 {
2 {
a ()
3 {
b ()
4 {
}
}
}
}
Sometimes we see the compiler generate an address range in the DWARF for "foo"
(block 1 above) as say [0x1000-0x1100). Then the range for "a" is something
like [0x1050-0x1060) (note that it is correctly scoped within the "foo"
address range). And then we get "b" which is a child of "a", yet the debug
info says it has a range of [0x1060-0x1080) (not contained within "a"). We now
detect this issue when making our blocks and add an extra range to "a".
Also added a new "lldb" logging category named "symbol" where we can find out
about symbol file errors and warnings.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@140822 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
index 13e0d1a..b101c17 100644
--- a/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ b/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -635,7 +635,7 @@
const DWARFDebugRanges::Range *debug_range;
for (range_idx = 0; (debug_range = ranges.RangeAtIndex(range_idx)) != NULL; range_idx++)
{
- block.AddRange(debug_range->begin_offset, debug_range->end_offset);
+ block.AddRange(VMRange (debug_range->begin_offset, debug_range->end_offset));
}
}
diff --git a/source/Symbol/Block.cpp b/source/Symbol/Block.cpp
index ed77721..d0f8ff3 100644
--- a/source/Symbol/Block.cpp
+++ b/source/Symbol/Block.cpp
@@ -8,9 +8,13 @@
//===----------------------------------------------------------------------===//
#include "lldb/Symbol/Block.h"
-#include "lldb/Symbol/Function.h"
+
+#include "lldb/lldb-private-log.h"
+
+#include "lldb/Core/Log.h"
#include "lldb/Core/Module.h"
#include "lldb/Core/Section.h"
+#include "lldb/Symbol/Function.h"
#include "lldb/Symbol/SymbolFile.h"
#include "lldb/Symbol/SymbolVendor.h"
#include "lldb/Symbol/VariableList.h"
@@ -433,10 +437,53 @@
}
void
-Block::AddRange(addr_t start_offset, addr_t end_offset)
+Block::AddRange (const VMRange& new_range)
{
- m_ranges.resize(m_ranges.size()+1);
- m_ranges.back().Reset(start_offset, end_offset);
+ Block *parent_block = GetParent ();
+ if (parent_block && !parent_block->Contains(new_range))
+ {
+ LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SYMBOLS));
+ if (log)
+ {
+ Module *module = m_parent_scope->CalculateSymbolContextModule();
+ Function *function = m_parent_scope->CalculateSymbolContextFunction();
+ const addr_t function_file_addr = function->GetAddressRange().GetBaseAddress().GetFileAddress();
+ const addr_t block_start_addr = function_file_addr + new_range.GetBaseAddress ();
+ const addr_t block_end_addr = function_file_addr + new_range.GetEndAddress ();
+ Type *func_type = function->GetType();
+
+ const Declaration &func_decl = func_type->GetDeclaration();
+ if (func_decl.GetLine())
+ {
+ log->Printf ("warning: %s/%s:%u block {0x%8.8x} has range[%u] [0x%llx - 0x%llx) which is not contained in parent block {0x%8.8x} in function {0x%8.8x} from %s/%s",
+ func_decl.GetFile().GetDirectory().GetCString(),
+ func_decl.GetFile().GetFilename().GetCString(),
+ func_decl.GetLine(),
+ GetID(),
+ (uint32_t)m_ranges.size(),
+ block_start_addr,
+ block_end_addr,
+ parent_block->GetID(),
+ function->GetID(),
+ module->GetFileSpec().GetDirectory().GetCString(),
+ module->GetFileSpec().GetFilename().GetCString());
+ }
+ else
+ {
+ log->Printf ("warning: block {0x%8.8x} has range[%u] [0x%llx - 0x%llx) which is not contained in parent block {0x%8.8x} in function {0x%8.8x} from %s/%s",
+ GetID(),
+ (uint32_t)m_ranges.size(),
+ block_start_addr,
+ block_end_addr,
+ parent_block->GetID(),
+ function->GetID(),
+ module->GetFileSpec().GetDirectory().GetCString(),
+ module->GetFileSpec().GetFilename().GetCString());
+ }
+ }
+ parent_block->AddRange (new_range);
+ }
+ m_ranges.push_back(new_range);
}
// Return the current number of bytes that this object occupies in memory
@@ -605,7 +652,7 @@
{
if (m_parent_scope)
{
- Block *parent_block = m_parent_scope->CalculateSymbolContextBlock();
+ Block *parent_block = GetParent();
if (parent_block)
return parent_block->GetSiblingForChild (this);
}
diff --git a/source/lldb-log.cpp b/source/lldb-log.cpp
index 737cdc4..6dc32f0 100644
--- a/source/lldb-log.cpp
+++ b/source/lldb-log.cpp
@@ -135,6 +135,7 @@
else if (0 == ::strncasecmp(arg, "host", 4)) flag_bits &= ~LIBLLDB_LOG_HOST;
else if (0 == ::strncasecmp(arg, "unwind", 6)) flag_bits &= ~LIBLLDB_LOG_UNWIND;
else if (0 == ::strncasecmp(arg, "types", 5)) flag_bits &= ~LIBLLDB_LOG_TYPES;
+ else if (0 == ::strncasecmp(arg, "symbol", 6)) flag_bits &= ~LIBLLDB_LOG_SYMBOLS;
else
{
feedback_strm->Printf ("error: unrecognized log category '%s'\n", arg);
@@ -202,6 +203,7 @@
else if (0 == ::strncasecmp(arg, "host", 4)) flag_bits |= LIBLLDB_LOG_HOST;
else if (0 == ::strncasecmp(arg, "unwind", 6)) flag_bits |= LIBLLDB_LOG_UNWIND;
else if (0 == ::strncasecmp(arg, "types", 5)) flag_bits |= LIBLLDB_LOG_TYPES;
+ else if (0 == ::strncasecmp(arg, "symbol", 6)) flag_bits |= LIBLLDB_LOG_SYMBOLS;
else
{
feedback_strm->Printf("error: unrecognized log category '%s'\n", arg);
@@ -241,6 +243,7 @@
" step - log step related activities\n"
" unwind - log stack unwind activities\n"
" verbose - enable verbose logging\n"
+ " symbol - log symbol related issues and warnings\n"
" watch - log watchpoint related activities\n"
" types - log type system related activities\n");
}