Optimize warning report format.

Signed-off-by: Ruoyu Qiu <cabbaken@outlook.com>

Author: cabbaken

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

@@ -475,14 +475,15 @@ Sections:
 # 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 0x0000000000000040 memsz 0x0000000000000040 flags ---
-# WARN:  DYNAMIC off    0x00000000000000c0 vaddr 0x000000000000101d paddr 0x000000000000101d align 2**0
-# WARN:          filesz 0x0000000000000030 memsz 0x0000000000000030 flags ---
+# 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 0x0000001245657656
+# WARN:  NEEDED 0x0000000000000011
 # WARN:  STRTAB 0x0000000000001000
+# WARN:  STRSZ  0x0000000000000010
 
 --- !ELF
 FileHeader:
@@ -500,9 +501,11 @@ Sections:
     Type: SHT_DYNAMIC
     Entries:
      - Tag:   DT_NEEDED
-       Value: 0x1245657656
+       Value: 0x11
      - Tag:   DT_STRTAB
        Value: 0x1000
+     - Tag:   DT_STRSZ
+       Value: 0x10
      - Tag:   DT_NULL
        Value: 0x0
 ProgramHeaders:

llvm/tools/llvm-objdump/ELFDump.cpp

@@ -223,12 +223,13 @@ template <class ELFT> void ELFDumper<ELFT>::printDynamicSection() {
   outs() << "\nDynamic Section:\n";
   typename ELFT::Xword StringTableSize{0};
   for (const typename ELFT::Shdr &Sec : cantFail(Elf.sections())) {
-    if (Sec.sh_type == ELF::SHT_DYNSYM) {
+    if (Sec.sh_type == ELF::SHT_DYNAMIC || Sec.sh_type == ELF::SHT_DYNSYM) {
       Expected<const typename ELFT::Shdr *> StringTableSecOrError =
           getSection<ELFT>(cantFail(Elf.sections()), Sec.sh_link);
       if (!StringTableSecOrError) {
-        consumeError(StringTableSecOrError.takeError());
-        break;
+        reportWarning(toString(StringTableSecOrError.takeError()),
+                      Obj.getFileName());
+        continue;
       }
       StringTableSize = StringTableSize < (*StringTableSecOrError)->sh_size
                             ? (*StringTableSecOrError)->sh_size
@@ -258,7 +259,9 @@ template <class ELFT> void ELFDumper<ELFT>::printDynamicSection() {
       if (StrTabOrErr) {
         const char *Data = StrTabOrErr->data();
         if (Dyn.getVal() >= StringTableSize) {
-          reportWarning("invalid string table offset", Obj.getFileName());
+          reportWarning("invalid string table offset, string table size: 0x" +
+                            Twine::utohexstr(StringTableSize),
+                        Obj.getFileName());
           outs() << format(TagFmt.c_str(), Str.c_str())
                  << format(Fmt, (uint64_t)Dyn.getVal());
           continue;