Optimize dynamic-section.test and code style.

Signed-off-by: Ruoyu Qiu <[email protected]>

Author: cabbaken

llvm/test/tools/llvm-objdump/ELF/dynamic-section.test

@@ -474,14 +474,10 @@ Sections:
 # RUN: yaml2obj --docnum=5 %s -o %t5
 # RUN: llvm-objdump -p %t5 2>&1 | FileCheck %s --strict-whitespace -DFILE=%t5 --check-prefix=WARN
 
-# WARN: Program Header:
-# WARN:    LOAD off    0x00000000000000b0 vaddr 0x0000000000001000 paddr 0x0000000000001000 align 2**0
-# WARN:         filesz 0x0000000000000050 memsz 0x0000000000000050 flags ---
-# WARN: DYNAMIC off    0x00000000000000c0 vaddr 0x000000000000101d paddr 0x000000000000101d align 2**0
-# WARN:         filesz 0x0000000000000040 memsz 0x0000000000000040 flags ---
 # WARN: Dynamic Section:
 # WARN: warning: '[[FILE]]': invalid string table offset
-# WARN:  NEEDED 0x0000000000000011
+# WARN:  NEEDED 0x0000000000000010
+# WARN:  NEEDED
 # WARN:  STRTAB 0x0000000000001000
 # WARN:  STRSZ  0x0000000000000010
 
@@ -496,12 +492,13 @@ Sections:
     Type:    SHT_STRTAB
     Address: 0x1000
     Size:    0x10
-    Content: "004400550066007700"
   - Name: .dynamic
     Type: SHT_DYNAMIC
     Entries:
      - Tag:   DT_NEEDED
-       Value: 0x11
+       Value: 0x10
+     - Tag:   DT_NEEDED
+       Value: 0x0F
      - Tag:   DT_STRTAB
        Value: 0x1000
      - Tag:   DT_STRSZ
@@ -514,6 +511,5 @@ ProgramHeaders:
     FirstSec: .dynstr
     LastSec:  .dynamic
   - Type:     PT_DYNAMIC
-    VAddr:    0x101D
     FirstSec: .dynamic
     LastSec:  .dynamic

llvm/tools/llvm-objdump/ELFDump.cpp

@@ -72,15 +72,15 @@ static Expected<StringRef> getDynamicStrTab(const ELFFile<ELFT> &Elf) {
         return MappedAddrOrError.takeError();
       MappedAddr = *MappedAddrOrError;
     }
-    if (Dyn.d_tag == ELF::DT_STRSZ) {
+    if (Dyn.d_tag == ELF::DT_STRSZ)
       StringTableSize = Dyn.getVal();
-    }
   }
   if (MappedAddr && StringTableSize)
     return StringRef(reinterpret_cast<const char *>(MappedAddr),
                      StringTableSize);
 
-  // If the dynamic segment is not present, we fall back on the sections.
+  // If the dynamic segment is not present, or is missing the important tags, we
+  // fall back on the sections.
   auto SectionsOrError = Elf.sections();
   if (!SectionsOrError)
     return SectionsOrError.takeError();