Revert "[LLDB][ELF] Load both, .symtab and .dynsym sections"

This reverts commit 3a4781b. llvm-svn: 371625
llvm · Sep 11, 2019 · 2f3884c · 2f3884c
1 parent d44c4a7
commit 2f3884c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 119 deletions.
diff --git a/lldb/lit/Modules/ELF/Inputs/load-from-dynsym-alone.c b/lldb/lit/Modules/ELF/Inputs/load-from-dynsym-alone.c
diff --git a/lldb/lit/Modules/ELF/Inputs/load-symtab-and-dynsym.c b/lldb/lit/Modules/ELF/Inputs/load-symtab-and-dynsym.c
diff --git a/lldb/lit/Modules/ELF/load-from-dynsym-alone.test b/lldb/lit/Modules/ELF/load-from-dynsym-alone.test
diff --git a/lldb/lit/Modules/ELF/load-symtab-and-dynsym.test b/lldb/lit/Modules/ELF/load-symtab-and-dynsym.test
diff --git a/lldb/lit/helper/toolchain.py b/lldb/lit/helper/toolchain.py
@@ -126,6 +126,6 @@ def use_support_substitutions(config):
 
     support_tools = ['yaml2obj', 'obj2yaml', 'llvm-pdbutil',
                      'llvm-mc', 'llvm-readobj', 'llvm-objdump',
-                     'llvm-objcopy', 'lli', 'llvm-strip']
+                     'llvm-objcopy', 'lli']
     additional_tool_dirs += [config.lldb_tools_dir, config.llvm_tools_dir]
     llvm_config.add_tool_substitutions(support_tools, additional_tool_dirs)
diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@@ -2647,31 +2647,21 @@ Symtab *ObjectFileELF::GetSymtab() {
     // smaller version of the symtab that only contains global symbols. The
     // information found in the dynsym is therefore also found in the symtab,
     // while the reverse is not necessarily true.
-    // One exception to the above rule is when we have minidebuginfo embedded
-    // into a compressed .gnu_debugdata section. This section contains a .symtab
-    // from which all symbols already contained in the .dynsym are stripped.
     Section *symtab =
         section_list->FindSectionByType(eSectionTypeELFSymbolTable, true).get();
+    if (!symtab) {
+      // The symtab section is non-allocable and can be stripped, so if it
+      // doesn't exist then use the dynsym section which should always be
+      // there.
+      symtab =
+          section_list->FindSectionByType(eSectionTypeELFDynamicSymbols, true)
+              .get();
+    }
     if (symtab) {
       m_symtab_up.reset(new Symtab(symtab->GetObjectFile()));
       symbol_id += ParseSymbolTable(m_symtab_up.get(), symbol_id, symtab);
     }
 
-    // The symtab section is non-allocable and can be stripped, while the dynsym
-    // section which should always be always be there. If both exist we load
-    // both to support the minidebuginfo case. Otherwise we just load the dynsym
-    // section.
-    Section *dynsym =
-        section_list->FindSectionByType(eSectionTypeELFDynamicSymbols, true)
-            .get();
-    if (dynsym) {
-      if (!m_symtab_up) {
-        auto sec = symtab ? symtab : dynsym;
-        m_symtab_up.reset(new Symtab(sec->GetObjectFile()));
-      }
-      symbol_id += ParseSymbolTable(m_symtab_up.get(), symbol_id, dynsym);
-    }
-
     // DT_JMPREL
     //      If present, this entry's d_ptr member holds the address of
     //      relocation