Fixed an issue when debugging with DWARF in the .o files where

if two functions had the same demangled names (constructors where
we have the in charge and not in charge version) we could end up
mixing the two up when making the function in the DWARF. This was
because we need to lookup the symbol by name and we need to use the
mangled name if there is one. This ensures we get the correct address
and that we resolve the linked addresses correctly for DWARf with debug
map.

llvm-svn: 121116

1 files changed, 2 insertions, 4 deletions

diff --git a/lldb/source/Core/Section.cpp b/lldb/source/Core/Section.cpp
index 28935b2249c..df4dc258b10 100644
--- a/lldb/source/Core/Section.cpp
+++ b/lldb/source/Core/Section.cpp
@@ -272,7 +272,7 @@ Section::Dump (Stream *s, Target *target) const
             addr = m_linked_section->GetFileAddress() + m_linked_offset;
         }
 
-        int indent = (sizeof(void*) + 1 + sizeof(user_id_t) + 1) * 2 + 3 + s->GetIndentLevel();
+        int indent = 26 + s->GetIndentLevel();
         s->Printf("%*.*s", indent, indent, "");
         VMRange linked_range(addr, addr + m_byte_size);
         linked_range.Dump (s, 0);
@@ -289,9 +289,7 @@ Section::Dump (Stream *s, Target *target) const
 void
 Section::DumpName (Stream *s) const
 {
-    if (m_linked_section)
-        return m_linked_section->DumpName(s);
-    else if (m_parent == NULL)
+    if (m_parent == NULL)
     {
         // The top most section prints the module basename
         const char *module_basename = m_module->GetFileSpec().GetFilename().AsCString();