[llvm-readobj][llvm-readelf] - Remove excessive empty lines when reporting errors and warnings.

[grimar]

Summary

After recent changes it is now seems possible to get rid of
printing '\n' before each error and warning. This makes the output
cleaner.

[jhenderson]

On the surface, this change looks fine to me. Have you checked that there are no more cases in the code where a warning can be reported in the middle of a line?

[grimar]

In D71246#1777679, @jhenderson wrote:

On the surface, this change looks fine to me. Have you checked that there are no more cases in the code where a warning can be reported in the middle of a line?

I reviewed them briefly and did not find anything obviously suspicious. Since we are going to switch to reporting unique warnings everywhere (right?),
then any such places will be revealed anyways in case they still are not covered by our tests.

[jhenderson]

Okay, LGTM.

llvm/test/tools/llvm-readobj/ELF/addrsig.test

- Name: .llvm_addrsig
     Content: "FF"
 
 ## Check we report a warning when SHT_LLVM_ADDRSIG references a symbol that can't be
 ## dumped (e.g. the index value is larger than the number of symbols in .symtab).
 
 # RUN: yaml2obj --docnum=3 %s -o %t3.o
 # RUN: llvm-readobj --addrsig %t3.o 2>&1 | FileCheck %s -DFILE=%t3.o --check-prefix=INVALID-INDEX
 
-# INVALID-INDEX:       Addrsig [
-# INVALID-INDEX-NEXT:    Sym: foo (1)
-# INVALID-INDEX-EMPTY:
-# INVALID-INDEX-NEXT:    warning: '[[FILE]]': unable to get symbol from section [index 2]: invalid symbol index (255)
-# INVALID-INDEX-NEXT:    Sym: <?> (255)
-# INVALID-INDEX-NEXT:    Sym: bar (2)
-# INVALID-INDEX-NEXT:  ]
+# INVALID-INDEX:      Addrsig [
+# INVALID-INDEX-NEXT:   Sym: foo (1)
+# INVALID-INDEX-NEXT:   warning: '[[FILE]]': unable to get symbol from section [index 2]: invalid symbol index (255)
+# INVALID-INDEX-NEXT:   Sym: <?> (255)
+# INVALID-INDEX-NEXT:   Sym: bar (2)
+# INVALID-INDEX-NEXT: ]
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_DYN
   Machine: EM_X86_64
 Sections:

llvm/test/tools/llvm-readobj/ELF/broken-dynamic-reloc-name.test

 ## Check that llvm-readobj/llvm-readelf reports an error when dumping relocations if a dynamic
 ## symbol name offset is broken (goes past the end of the dynamic symbol string table).
 
 # RUN: yaml2obj %s -o %t
 # RUN: llvm-readobj --dyn-relocations %t 2>&1 | FileCheck %s -DFILE=%t --check-prefix=LLVM
 # RUN: llvm-readelf --dyn-relocations %t 2>&1 | FileCheck %s -DFILE=%t --check-prefix=GNU
 
 # LLVM:      Dynamic Relocations {
-# LLVM-EMPTY:
 # LLVM-NEXT: warning: '[[FILE]]': unable to get name of the dynamic symbol with index 1: st_name (0x1234) is past the end of the string table of size 0x1
 # LLVM-NEXT:   0x0 R_X86_64_NONE <corrupt> 0x0
 # LLVM-NEXT: }
 
 # GNU:      'RELA' relocation section at offset {{.+}} contains 24 bytes:
 # GNU-NEXT: Offset           Info             Type          Symbol's Value   Symbol's Name + Addend
-# GNU-EMPTY:
 # GNU-NEXT: warning: '[[FILE]]': unable to get name of the dynamic symbol with index 1: st_name (0x1234) is past the end of the string table of size 0x1
 # GNU-NEXT: 0000000000000000 0000000100000000 R_X86_64_NONE 0000000000000000 <corrupt> + 0
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_DYN

llvm/test/tools/llvm-readobj/ELF/dependent-libraries.test

- Name:      .deplibs
     Type:      SHT_LLVM_DEPENDENT_LIBRARIES
     Libraries: [ foo, bar, foo ]
 
 ## Now, check how we dump a mix of valid, empty and invalid SHT_LLVM_DEPENDENT_LIBRARIES sections.
 
 # RUN: yaml2obj --docnum=2 %s -o %t2
 # RUN: llvm-readobj --dependent-libraries %t2 2>&1 | FileCheck %s --check-prefix=MIX -DFILE=%t2
 
-# MIX:       DependentLibs [
-# MIX-EMPTY:
-# MIX-NEXT:   warning: '[[FILE]]': SHT_LLVM_DEPENDENT_LIBRARIES section at index 1 is broken: the content is not null-terminated
-# MIX-NEXT:   abc
-# MIX-EMPTY:
-# MIX-NEXT:   warning: '[[FILE]]': SHT_LLVM_DEPENDENT_LIBRARIES section at index 4 is broken: section [index 4] has a sh_offset (0xffff0000) + sh_size (0x4) that is greater than the file size (0x2c0)
-# MIX-NEXT:   bar
-# MIX-NEXT:   xxx
-# MIX-NEXT:  ]
+# MIX:      DependentLibs [
+# MIX-NEXT:  warning: '[[FILE]]': SHT_LLVM_DEPENDENT_LIBRARIES section at index 1 is broken: the content is not null-terminated
+# MIX-NEXT:  abc
+# MIX-NEXT:  warning: '[[FILE]]': SHT_LLVM_DEPENDENT_LIBRARIES section at index 4 is broken: section [index 4] has a sh_offset (0xffff0000) + sh_size (0x4) that is greater than the file size (0x2c0)
+# MIX-NEXT:  bar
+# MIX-NEXT:  xxx
+# MIX-NEXT: ]
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_X86_64
 Sections:

llvm/test/tools/llvm-readobj/ELF/invalid-shstrndx.test

 # RUN: yaml2obj %s -o %t
 # RUN: not llvm-readelf --headers -S 2>&1 %t | FileCheck %s -DFILE=%t --check-prefix=GNU
 # RUN: not llvm-readobj --headers -S 2>&1 %t | FileCheck %s -DFILE=%t --check-prefix=LLVM
 
 # GNU:      ELF Header:
 # GNU:        Section header string table index: 255
 # GNU-NEXT:   There are 3 section headers, starting at offset 0x58:
 # GNU:      Section Headers:
 # GNU-NEXT:  [Nr] Name
-# GNU-EMPTY:
 # GNU-NEXT:  error: '[[FILE]]': section header string table index 255 does not exist
 
 # LLVM:      ElfHeader {
 # LLVM:        StringTableSectionIndex: 255
 # LLVM-NEXT: }
 # LLVM-NEXT: Sections [
-# LLVM-EMPTY:
 # LLVM-NEXT: error: '[[FILE]]': section header string table index 255 does not exist
 
 --- !ELF
 FileHeader:
   Class:     ELFCLASS64
   Data:      ELFDATA2LSB
   Type:      ET_REL
   Machine:   EM_X86_64
   SHStrNdx:  0xFF

llvm/test/tools/llvm-readobj/ELF/linker-options.test

 ## Check that we can use the --elf-linker-options option
 ## to dump SHT_LLVM_LINKER_OPTIONS sections.
 
 # RUN: yaml2obj --docnum=1 %s -o %t1
 # RUN: llvm-readobj --elf-linker-options %t1 2>&1 | FileCheck %s --check-prefix=CHECK -DFILE=%t1
 
-# CHECK:       LinkerOptions [
-# CHECK:         option 0: value 0
-# CHECK:         option 1: value 1
-# CHECK-EMPTY:
-# CHECK-NEXT:    warning: '[[FILE]]': SHT_LLVM_LINKER_OPTIONS section at index 2 is broken: an incomplete key-value pair was found. The last possible key was: "c"
-# CHECK-EMPTY:
-# CHECK-NEXT:    warning: '[[FILE]]': SHT_LLVM_LINKER_OPTIONS section at index 4 is broken: the content is not null-terminated
-# CHECK-NEXT:    option 3: value 3
-# CHECK-NEXT:  ]
+# CHECK:      LinkerOptions [
+# CHECK:        option 0: value 0
+# CHECK:        option 1: value 1
+# CHECK-NEXT:   warning: '[[FILE]]': SHT_LLVM_LINKER_OPTIONS section at index 2 is broken: an incomplete key-value pair was found. The last possible key was: "c"
+# CHECK-NEXT:   warning: '[[FILE]]': SHT_LLVM_LINKER_OPTIONS section at index 4 is broken: the content is not null-terminated
+# CHECK-NEXT:   option 3: value 3
+# CHECK-NEXT: ]
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_X86_64
 Sections:

llvm/test/tools/llvm-readobj/ELF/verdef-invalid.test

 
 # INVALID-VERDEF-LLVM:      VersionSymbols [
 # INVALID-VERDEF-LLVM-NEXT:    Symbol {
 # INVALID-VERDEF-LLVM-NEXT:      Version: 0
 # INVALID-VERDEF-LLVM-NEXT:      Name:
 # INVALID-VERDEF-LLVM-NEXT:    }
 # INVALID-VERDEF-LLVM-NEXT:    Symbol {
 # INVALID-VERDEF-LLVM-NEXT:    Version: 2
-# INVALID-VERDEF-LLVM-EMPTY:
 # INVALID-VERDEF-LLVM-NEXT:  warning: '[[FILE]]': invalid SHT_GNU_verdef section with index 2: version definition 1 goes past the end of the section
 # INVALID-VERDEF-LLVM-NEXT:    Name: foo@<corrupt>
 
 # INVALID-VERDEF-GNU:      Version symbols section '.gnu.version' contains 2 entries:
 # INVALID-VERDEF-GNU-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 5 (.dynsym)
-# INVALID-VERDEF-GNU-EMPTY:
 # INVALID-VERDEF-GNU-NEXT: warning: '[[FILE]]': unable to get a version for entry 1 of SHT_GNU_versym section with index 1: invalid SHT_GNU_verdef section with index 2: version definition 1 goes past the end of the section
 # INVALID-VERDEF-GNU-NEXT:   000: 0 (*local*) 2 (<corrupt>)
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_DYN

llvm/test/tools/llvm-readobj/ELF/verneed-invalid.test

 ## this situation properly.
 
 # RUN: yaml2obj --docnum=2 %s -o %t2
 # RUN: llvm-readelf -V %t2 2>&1 | FileCheck %s -DFILE=%t2 --check-prefix=GNU-NOLINK
 # RUN: llvm-readobj -V %t2 2>&1 | FileCheck %s -DFILE=%t2 --check-prefix=LLVM-NOLINK
 
 # GNU-NOLINK:      Version symbols section '.gnu.version' contains 2 entries:
 # GNU-NOLINK-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 5 (.dynsym)
-# GNU-NOLINK-EMPTY:
 # GNU-NOLINK-NEXT: warning: '[[FILE]]': invalid string table linked to SHT_GNU_verneed section with index 2: invalid sh_type for string table section [index 0]: expected SHT_STRTAB, but got SHT_NULL
 # GNU-NOLINK-NEXT:   000:   0 (*local*) 2 (<corrupt>)
-# GNU-NOLINK-EMPTY:
 # GNU-NOLINK:      Version needs section '.gnu.version_r' contains 1 entries:
 # GNU-NOLINK-NEXT:  Addr: 0000000000000000  Offset: 0x000044  Link: 0 ()
 # GNU-NOLINK-NEXT:   0x0000: Version: 1  File: <corrupt vn_file: 9>  Cnt: 1
 # GNU-NOLINK-NEXT:   0x0010:   Name: <corrupt>  Flags: none Version: 2
 
 # LLVM-NOLINK:      VersionSymbols [
 # LLVM-NOLINK:        Symbol {
 # LLVM-NOLINK-NEXT:     Version: 0
 # LLVM-NOLINK-NEXT:     Name:
 # LLVM-NOLINK-NEXT:   }
 # LLVM-NOLINK-NEXT:   Symbol {
 # LLVM-NOLINK-NEXT:     Version: 2
-# LLVM-NOLINK-EMPTY:
 # LLVM-NOLINK-NEXT:  warning: '[[FILE]]': invalid string table linked to SHT_GNU_verneed section with index 2: invalid sh_type for string table section [index 0]: expected SHT_STRTAB, but got SHT_NULL
 # LLVM-NOLINK-NEXT:     Name: foo@<corrupt>
 # LLVM-NOLINK-NEXT:   }
 # LLVM-NOLINK-NEXT: ]
 
 # LLVM-NOLINK:      VersionRequirements [
 # LLVM-NOLINK-NEXT:   Dependency {
 # LLVM-NOLINK-NEXT:     Version: 1
- Name:    foo
     Binding: STB_GLOBAL
 
 ## We can't parse misaligned auxiliary version records.
 
 # RUN: yaml2obj --docnum=3 %s -o %t3
 # RUN: llvm-readelf -V %t3 2>&1 | FileCheck %s -DFILE=%t3 --check-prefix=BROKEN-AUX-GNU
 # RUN: llvm-readobj -V %t3 2>&1 | FileCheck %s -DFILE=%t3 --check-prefix=BROKEN-AUX-LLVM
 
-# BROKEN-AUX-GNU:       Version symbols section '.gnu.version' contains 1 entries:
-# BROKEN-AUX-GNU-NEXT:   Addr: 0000000000000000  Offset: 0x000040  Link: 5 (.dynsym)
-# BROKEN-AUX-GNU-EMPTY:
-# BROKEN-AUX-GNU-NEXT:  warning: '[[FILE]]': unable to get a version for entry 0 of SHT_GNU_versym section with index 1: invalid SHT_GNU_verneed section with index 2: found a misaligned auxiliary entry at offset 0x11
-# BROKEN-AUX-GNU-NEXT:   000:   2 (<corrupt>)
+# BROKEN-AUX-GNU:      Version symbols section '.gnu.version' contains 1 entries:
+# BROKEN-AUX-GNU-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 5 (.dynsym)
+# BROKEN-AUX-GNU-NEXT: warning: '[[FILE]]': unable to get a version for entry 0 of SHT_GNU_versym section with index 1: invalid SHT_GNU_verneed section with index 2: found a misaligned auxiliary entry at offset 0x11
+# BROKEN-AUX-GNU-NEXT:  000:   2 (<corrupt>)
 
-# BROKEN-AUX-LLVM:       VersionSymbols [
-# BROKEN-AUX-LLVM-NEXT:    Symbol {
-# BROKEN-AUX-LLVM-NEXT:      Version: 2
-# BROKEN-AUX-LLVM-EMPTY:
-# BROKEN-AUX-LLVM-NEXT:  warning: '[[FILE]]': invalid SHT_GNU_verneed section with index 2: found a misaligned auxiliary entry at offset 0x11
-# BROKEN-AUX-LLVM-NEXT:      Name: @<corrupt>
-# BROKEN-AUX-LLVM-NEXT:    }
-# BROKEN-AUX-LLVM-NEXT:  ]
+# BROKEN-AUX-LLVM:      VersionSymbols [
+# BROKEN-AUX-LLVM-NEXT:   Symbol {
+# BROKEN-AUX-LLVM-NEXT:     Version: 2
+# BROKEN-AUX-LLVM-NEXT: warning: '[[FILE]]': invalid SHT_GNU_verneed section with index 2: found a misaligned auxiliary entry at offset 0x11
+# BROKEN-AUX-LLVM-NEXT:     Name: @<corrupt>
+# BROKEN-AUX-LLVM-NEXT:   }
+# BROKEN-AUX-LLVM-NEXT: ]
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64
 Sections:
DynamicSymbols:
   - Name: foo
 
 ## Check that we report a warning when sh_link references a non-existent section.
 
 # RUN: yaml2obj --docnum=6 %s -o %t6
 # RUN: llvm-readobj --sections -V %t6 2>&1 | FileCheck %s -DFILE=%t6 --implicit-check-not="warning:" --check-prefix=INVALID-LINK-LLVM
 # RUN: llvm-readelf --sections -V %t6 2>&1 | FileCheck %s -DFILE=%t6 --implicit-check-not="warning:" --check-prefix=INVALID-LINK-GNU
 
-# INVALID-LINK-LLVM:       VersionRequirements [
-# INVALID-LINK-LLVM-EMPTY:
+# INVALID-LINK-LLVM:      VersionRequirements [
 # INVALID-LINK-LLVM-NEXT:  warning: '[[FILE]]': invalid section linked to SHT_GNU_verneed section with index 1: invalid section index: 255
 # INVALID-LINK-LLVM-NEXT:   Dependency {
 # INVALID-LINK-LLVM-NEXT:     Version: 1
 # INVALID-LINK-LLVM-NEXT:     Count: 1
 # INVALID-LINK-LLVM-NEXT:     FileName: <corrupt vn_file: 1>
 # INVALID-LINK-LLVM-NEXT:     Entries [
 # INVALID-LINK-LLVM-NEXT:       Entry {
 # INVALID-LINK-LLVM-NEXT:         Hash: 0
 # INVALID-LINK-LLVM-NEXT:         Flags [ (0x0)
 # INVALID-LINK-LLVM-NEXT:         ]
 # INVALID-LINK-LLVM-NEXT:         Index: 0
 # INVALID-LINK-LLVM-NEXT:         Name: <corrupt>
 # INVALID-LINK-LLVM-NEXT:       }
 # INVALID-LINK-LLVM-NEXT:     ]
 # INVALID-LINK-LLVM-NEXT:   }
 # INVALID-LINK-LLVM-NEXT: ]
 
-# INVALID-LINK-GNU:       Version needs section '.gnu.version_r' contains 1 entries:
-# INVALID-LINK-GNU-EMPTY:
-# INVALID-LINK-GNU-NEXT:  warning: '[[FILE]]': invalid section linked to SHT_GNU_verneed section with index 1: invalid section index: 255
-# INVALID-LINK-GNU-NEXT:  Addr: 0000000000000000 Offset: 0x000040 Link: 255 (<corrupt>)
-# INVALID-LINK-GNU-NEXT:   0x0000: Version: 1 File: <corrupt vn_file: 1> Cnt: 1
-# INVALID-LINK-GNU-NEXT:   0x0010: Name: <corrupt> Flags: none Version: 0
+# INVALID-LINK-GNU:      Version needs section '.gnu.version_r' contains 1 entries:
+# INVALID-LINK-GNU-NEXT: warning: '[[FILE]]': invalid section linked to SHT_GNU_verneed section with index 1: invalid section index: 255
+# INVALID-LINK-GNU-NEXT: Addr: 0000000000000000 Offset: 0x000040 Link: 255 (<corrupt>)
+# INVALID-LINK-GNU-NEXT:  0x0000: Version: 1 File: <corrupt vn_file: 1> Cnt: 1
+# INVALID-LINK-GNU-NEXT:  0x0010: Name: <corrupt> Flags: none Version: 0
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64
 Sections:

llvm/test/tools/llvm-readobj/ELF/versym-invalid.test

 ## Test how llvm-readobj/llvm-readelf tools handle invalid SHT_GNU_versym sections.
 
 ## Check that we report a warning when sh_link references a non-existent section.
 
 # RUN: yaml2obj --docnum=1 %s -o %t1
 # RUN: llvm-readelf -V %t1 2>&1 | FileCheck -DFILE=%t1 %s --check-prefix=GNU-INVALID-LINK
 # RUN: llvm-readobj -V %t1 2>&1 | FileCheck -DFILE=%t1 %s --check-prefix=LLVM-INVALID-LINK
 
-# GNU-INVALID-LINK:       Version symbols section '.gnu.version' contains 0 entries:
-# GNU-INVALID-LINK-EMPTY:
-# GNU-INVALID-LINK-NEXT:  warning: '[[FILE]]': invalid section linked to SHT_GNU_versym section with index 1: invalid section index: 255
-# GNU-INVALID-LINK-NEXT:   Addr: 0000000000000000  Offset: 0x000040  Link: 255 (<corrupt>)
+# GNU-INVALID-LINK:      Version symbols section '.gnu.version' contains 0 entries:
+# GNU-INVALID-LINK-NEXT: warning: '[[FILE]]': invalid section linked to SHT_GNU_versym section with index 1: invalid section index: 255
+# GNU-INVALID-LINK-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 255 (<corrupt>)
 
-# LLVM-INVALID-LINK:       VersionSymbols [
-# LLVM-INVALID-LINK-EMPTY:
-# LLVM-INVALID-LINK-NEXT:  warning: '[[FILE]]': invalid section linked to SHT_GNU_versym section with index 1: invalid section index: 255
-# LLVM-INVALID-LINK-NEXT:  ]
+# LLVM-INVALID-LINK:      VersionSymbols [
+# LLVM-INVALID-LINK-NEXT: warning: '[[FILE]]': invalid section linked to SHT_GNU_versym section with index 1: invalid section index: 255
+# LLVM-INVALID-LINK-NEXT: ]
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64
 Sections:
   - Name:    .gnu.version
     Type:    SHT_GNU_versym
     Link:    0xFF
     Entries: [ ]
 
 ## Check that we report a warning when the sh_link field of a SHT_GNU_versym section does not reference
 ## a dynamic symbol table section.
 
 # RUN: yaml2obj --docnum=2 %s -o %t2
 # RUN: llvm-readelf -V %t2 2>&1 | FileCheck -DFILE=%t2 %s --check-prefix=INVALID-SYMBOL-TABLE-GNU
 # RUN: llvm-readobj -V %t2 2>&1 | FileCheck -DFILE=%t2 %s --check-prefix=INVALID-SYMBOL-TABLE-LLVM
 
-# INVALID-SYMBOL-TABLE-GNU:       Version symbols section '.gnu.version' contains 1 entries:
-# INVALID-SYMBOL-TABLE-GNU-NEXT:   Addr: 0000000000000000  Offset: 0x000040  Link: 0 ()
-# INVALID-SYMBOL-TABLE-GNU-EMPTY:
-# INVALID-SYMBOL-TABLE-GNU-NEXT:   warning: '[[FILE]]': invalid section linked to SHT_GNU_versym section with index 1: expected SHT_DYNSYM, but got SHT_NULL
-# INVALID-SYMBOL-TABLE-GNU-NEXT:   000:   0 (*local*)
+# INVALID-SYMBOL-TABLE-GNU:      Version symbols section '.gnu.version' contains 1 entries:
+# INVALID-SYMBOL-TABLE-GNU-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 0 ()
+# INVALID-SYMBOL-TABLE-GNU-NEXT:  warning: '[[FILE]]': invalid section linked to SHT_GNU_versym section with index 1: expected SHT_DYNSYM, but got SHT_NULL
+# INVALID-SYMBOL-TABLE-GNU-NEXT:  000:   0 (*local*)
 
-# INVALID-SYMBOL-TABLE-LLVM:       VersionSymbols [
-# INVALID-SYMBOL-TABLE-LLVM-EMPTY:
-# INVALID-SYMBOL-TABLE-LLVM-NEXT:  warning: '[[FILE]]': invalid section linked to SHT_GNU_versym section with index 1: expected SHT_DYNSYM, but got SHT_NULL
-# INVALID-SYMBOL-TABLE-LLVM-NEXT:  ]
+# INVALID-SYMBOL-TABLE-LLVM:      VersionSymbols [
+# INVALID-SYMBOL-TABLE-LLVM-NEXT: warning: '[[FILE]]': invalid section linked to SHT_GNU_versym section with index 1: expected SHT_DYNSYM, but got SHT_NULL
+# INVALID-SYMBOL-TABLE-LLVM-NEXT: ]
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64
 Sections:
   - Name:    .gnu.version
     Type:    SHT_GNU_versym
     Link:    0x0
     Entries: [ 0 ]
 
 ## Check we report a warning when something is wrong with a string table linked to a symbol table that
 ## is linked with SHT_GNU_versym. In this case we are unable to produce LLVM style output,
 ## but GNU style is fine because it does not need that string table.
 
 # RUN: yaml2obj --docnum=3 %s -o %t3
 # RUN: llvm-readelf -V %t3 2>&1 | FileCheck -DFILE=%t3 %s --check-prefix=INVALID-STRING-TABLE-GNU
 # RUN: llvm-readobj -V %t3 2>&1 | FileCheck -DFILE=%t3 %s --check-prefix=INVALID-STRING-TABLE-LLVM
 
-# INVALID-STRING-TABLE-GNU:       Version symbols section '.gnu.version' contains 1 entries:
-# INVALID-STRING-TABLE-GNU-NEXT:   Addr: 0000000000000000  Offset: 0x000040  Link: 5 (.dynsym)
-# INVALID-STRING-TABLE-GNU-EMPTY:
-# INVALID-STRING-TABLE-GNU-NEXT:   warning: '[[FILE]]': can't get a string table for the symbol table linked to SHT_GNU_versym section with index 1: invalid string table linked to SHT_DYNSYM section with index 5: invalid sh_type for string table section [index 2]: expected SHT_STRTAB, but got SHT_NULL
-# INVALID-STRING-TABLE-GNU-NEXT:   000:   0 (*local*)
+# INVALID-STRING-TABLE-GNU:      Version symbols section '.gnu.version' contains 1 entries:
+# INVALID-STRING-TABLE-GNU-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 5 (.dynsym)
+# INVALID-STRING-TABLE-GNU-NEXT:  warning: '[[FILE]]': can't get a string table for the symbol table linked to SHT_GNU_versym section with index 1: invalid string table linked to SHT_DYNSYM section with index 5: invalid sh_type for string table section [index 2]: expected SHT_STRTAB, but got SHT_NULL
+# INVALID-STRING-TABLE-GNU-NEXT:  000:   0 (*local*)
 
-# INVALID-STRING-TABLE-LLVM:       VersionSymbols [
-# INVALID-STRING-TABLE-LLVM-EMPTY:
-# INVALID-STRING-TABLE-LLVM-NEXT:  warning: '[[FILE]]': can't get a string table for the symbol table linked to SHT_GNU_versym section with index 1: invalid string table linked to SHT_DYNSYM section with index 5: invalid sh_type for string table section [index 2]: expected SHT_STRTAB, but got SHT_NULL
-# INVALID-STRING-TABLE-LLVM-NEXT:  ]
+# INVALID-STRING-TABLE-LLVM:      VersionSymbols [
+# INVALID-STRING-TABLE-LLVM-NEXT: warning: '[[FILE]]': can't get a string table for the symbol table linked to SHT_GNU_versym section with index 1: invalid string table linked to SHT_DYNSYM section with index 5: invalid sh_type for string table section [index 2]: expected SHT_STRTAB, but got SHT_NULL
+# INVALID-STRING-TABLE-LLVM-NEXT: ]
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64
 Sections:
   - Name:    .gnu.version
     Type:    SHT_GNU_versym
     Link:    .dynsym
     Entries: [ 0 ]
   - Name:    .dynstr
     Type:    SHT_NULL
 DynamicSymbols: []
 
 ## Check we report a warning when a SHT_GNU_versym section is not correctly aligned in memory.
 
 # RUN: yaml2obj --docnum=4 %s -o %t4
 # RUN: llvm-readelf -V %t4 2>&1 | FileCheck -DFILE=%t4 %s --check-prefix=MISALIGNED-GNU
 # RUN: llvm-readobj -V %t4 2>&1 | FileCheck -DFILE=%t4 %s --check-prefix=MISALIGNED-LLVM
 
-# MISALIGNED-GNU:       Version symbols section '.gnu.version' contains 0 entries:
-# MISALIGNED-GNU-NEXT:   Addr: 0000000000000000  Offset: 0x00ffff  Link: 0 ()
-# MISALIGNED-GNU-EMPTY:
-# MISALIGNED-GNU-NEXT:   warning: '[[FILE]]': the SHT_GNU_versym section with index 1 is misaligned
+# MISALIGNED-GNU:      Version symbols section '.gnu.version' contains 0 entries:
+# MISALIGNED-GNU-NEXT:  Addr: 0000000000000000  Offset: 0x00ffff  Link: 0 ()
+# MISALIGNED-GNU-NEXT:  warning: '[[FILE]]': the SHT_GNU_versym section with index 1 is misaligned
 
-# MISALIGNED-LLVM:       VersionSymbols [
-# MISALIGNED-LLVM-EMPTY:
-# MISALIGNED-LLVM-NEXT:   warning: '[[FILE]]': the SHT_GNU_versym section with index 1 is misaligned
-# MISALIGNED-LLVM-NEXT:  ]
+# MISALIGNED-LLVM:      VersionSymbols [
+# MISALIGNED-LLVM-NEXT:  warning: '[[FILE]]': the SHT_GNU_versym section with index 1 is misaligned
+# MISALIGNED-LLVM-NEXT: ]
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64
 Sections:
   - Name:    .gnu.version
     Type:    SHT_GNU_versym
     Entries: [ ]
     ShOffset: 0xffff
 
 ## Check we report a warning when a SHT_GNU_versym section has an invalid entry size.
 
 # RUN: yaml2obj --docnum=5 %s -o %t5
 # RUN: llvm-readelf -V %t5 2>&1 | FileCheck -DFILE=%t5 %s --check-prefix=INVALID-ENT-SIZE-GNU
 # RUN: llvm-readobj -V %t5 2>&1 | FileCheck -DFILE=%t5 %s --check-prefix=INVALID-ENT-SIZE-LLVM
 
-# INVALID-ENT-SIZE-GNU:       Version symbols section '.gnu.version' contains 1 entries:
-# INVALID-ENT-SIZE-GNU-NEXT:   Addr: 0000000000000000  Offset: 0x000040  Link: 0 ()
-# INVALID-ENT-SIZE-GNU-EMPTY:
-# INVALID-ENT-SIZE-GNU-NEXT:  warning: '[[FILE]]': cannot read content of SHT_GNU_versym section with index 1: section [index 1] has an invalid sh_entsize: 3
+# INVALID-ENT-SIZE-GNU:      Version symbols section '.gnu.version' contains 1 entries:
+# INVALID-ENT-SIZE-GNU-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 0 ()
+# INVALID-ENT-SIZE-GNU-NEXT: warning: '[[FILE]]': cannot read content of SHT_GNU_versym section with index 1: section [index 1] has an invalid sh_entsize: 3
 
-# INVALID-ENT-SIZE-LLVM:       VersionSymbols [
-# INVALID-ENT-SIZE-LLVM-EMPTY:
-# INVALID-ENT-SIZE-LLVM-NEXT:  warning: '[[FILE]]': cannot read content of SHT_GNU_versym section with index 1: section [index 1] has an invalid sh_entsize: 3
-# INVALID-ENT-SIZE-LLVM-NEXT:  ]
+# INVALID-ENT-SIZE-LLVM:      VersionSymbols [
+# INVALID-ENT-SIZE-LLVM-NEXT: warning: '[[FILE]]': cannot read content of SHT_GNU_versym section with index 1: section [index 1] has an invalid sh_entsize: 3
+# INVALID-ENT-SIZE-LLVM-NEXT: ]
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64
 Sections:
   - Name:    .gnu.version
     Type:    SHT_GNU_versym
     Entries: [ 0 ]
     EntSize: 3
 
 ## Check we report a warning when the number of version entries does not match the number of symbols in the associated symbol table.
 
 # RUN: yaml2obj --docnum=6 %s -o %t6
 # RUN: llvm-readelf -V %t6 2>&1 | FileCheck -DFILE=%t6 %s --check-prefix=SYMBOLS-NUM-MISMATCH-GNU
 # RUN: llvm-readobj -V %t6 2>&1 | FileCheck -DFILE=%t6 %s --check-prefix=SYMBOLS-NUM-MISMATCH-LLVM
 
-# SYMBOLS-NUM-MISMATCH-GNU:       Version symbols section '.gnu.version' contains 2 entries:
-# SYMBOLS-NUM-MISMATCH-GNU-NEXT:   Addr: 0000000000000000  Offset: 0x000040  Link: 4 (.dynsym)
-# SYMBOLS-NUM-MISMATCH-GNU-EMPTY:
-# SYMBOLS-NUM-MISMATCH-GNU-NEXT:   warning: '[[FILE]]': SHT_GNU_versym section with index 1: the number of entries (2) does not match the number of symbols (3) in the symbol table with index 4
-# SYMBOLS-NUM-MISMATCH-GNU-NEXT:    000:   0 (*local*)       1 (*global*)
+# SYMBOLS-NUM-MISMATCH-GNU:      Version symbols section '.gnu.version' contains 2 entries:
+# SYMBOLS-NUM-MISMATCH-GNU-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 4 (.dynsym)
+# SYMBOLS-NUM-MISMATCH-GNU-NEXT:  warning: '[[FILE]]': SHT_GNU_versym section with index 1: the number of entries (2) does not match the number of symbols (3) in the symbol table with index 4
+# SYMBOLS-NUM-MISMATCH-GNU-NEXT:   000:   0 (*local*)       1 (*global*)
 
-# SYMBOLS-NUM-MISMATCH-LLVM:       VersionSymbols [
-# SYMBOLS-NUM-MISMATCH-LLVM-EMPTY:
-# SYMBOLS-NUM-MISMATCH-LLVM-NEXT:  warning: '[[FILE]]': SHT_GNU_versym section with index 1: the number of entries (2) does not match the number of symbols (3) in the symbol table with index 4
-# SYMBOLS-NUM-MISMATCH-LLVM-NEXT:  ]
+# SYMBOLS-NUM-MISMATCH-LLVM:      VersionSymbols [
+# SYMBOLS-NUM-MISMATCH-LLVM-NEXT: warning: '[[FILE]]': SHT_GNU_versym section with index 1: the number of entries (2) does not match the number of symbols (3) in the symbol table with index 4
+# SYMBOLS-NUM-MISMATCH-LLVM-NEXT: ]
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64
 Sections:

 ## Check we report it when trying to dump dynamic symbols.
 
 # RUN: yaml2obj %s --docnum=8 -o %t8
 # RUN: llvm-readobj --dyn-syms %t8 2>&1 \
 # RUN:   | FileCheck -DFILE=%t8 --implicit-check-not=warning --check-prefix=VERSION-OVERFLOW-LLVM %s
 # RUN: llvm-readelf --dyn-syms %t8 2>&1 \
 # RUN:   | FileCheck -DFILE=%t8 --implicit-check-not=warning --check-prefix=VERSION-OVERFLOW-GNU %s
 
-# VERSION-OVERFLOW-LLVM:       DynamicSymbols [
-# VERSION-OVERFLOW-LLVM-EMPTY:
-# VERSION-OVERFLOW-LLVM-NEXT:  warning: '[[FILE]]': SHT_GNU_versym section refers to a version index 255 which is missing
-# VERSION-OVERFLOW-LLVM-NEXT:    Symbol {
-# VERSION-OVERFLOW-LLVM-NEXT:      Name: @<corrupt> (0)
-# VERSION-OVERFLOW-LLVM:       warning: '[[FILE]]': SHT_GNU_versym section refers to a version index 254 which is missing
-# VERSION-OVERFLOW-LLVM-NEXT:    Symbol {
-# VERSION-OVERFLOW-LLVM-NEXT:      Name: foo@<corrupt> (5)
-# VERSION-OVERFLOW-LLVM:         Symbol {
-# VERSION-OVERFLOW-LLVM-NEXT:      Name: bar@<corrupt> (1)
+# VERSION-OVERFLOW-LLVM:      DynamicSymbols [
+# VERSION-OVERFLOW-LLVM-NEXT: warning: '[[FILE]]': SHT_GNU_versym section refers to a version index 255 which is missing
+# VERSION-OVERFLOW-LLVM-NEXT:   Symbol {
+# VERSION-OVERFLOW-LLVM-NEXT:     Name: @<corrupt> (0)
+# VERSION-OVERFLOW-LLVM:      warning: '[[FILE]]': SHT_GNU_versym section refers to a version index 254 which is missing
+# VERSION-OVERFLOW-LLVM-NEXT:   Symbol {
+# VERSION-OVERFLOW-LLVM-NEXT:     Name: foo@<corrupt> (5)
+# VERSION-OVERFLOW-LLVM:        Symbol {
+# VERSION-OVERFLOW-LLVM-NEXT:     Name: bar@<corrupt> (1)
 
-# VERSION-OVERFLOW-GNU:       Symbol table '.dynsym' contains 3 entries:
-# VERSION-OVERFLOW-GNU-NEXT:   Num:    Value          Size Type    Bind   Vis       Ndx Name
-# VERSION-OVERFLOW-GNU-EMPTY:
-# VERSION-OVERFLOW-GNU-NEXT:  warning: '[[FILE]]': SHT_GNU_versym section refers to a version index 255 which is missing
-# VERSION-OVERFLOW-GNU-NEXT:      0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT   UND @<corrupt>
-# VERSION-OVERFLOW-GNU-EMPTY:
-# VERSION-OVERFLOW-GNU-NEXT:  warning: '[[FILE]]': SHT_GNU_versym section refers to a version index 254 which is missing
-# VERSION-OVERFLOW-GNU-NEXT:      1: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT   UND foo@<corrupt>
-# VERSION-OVERFLOW-GNU-NEXT:      2: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT   UND bar@<corrupt
+# VERSION-OVERFLOW-GNU:      Symbol table '.dynsym' contains 3 entries:
+# VERSION-OVERFLOW-GNU-NEXT:  Num:    Value          Size Type    Bind   Vis       Ndx Name
+# VERSION-OVERFLOW-GNU-NEXT: warning: '[[FILE]]': SHT_GNU_versym section refers to a version index 255 which is missing
+# VERSION-OVERFLOW-GNU-NEXT:     0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT   UND @<corrupt>
+# VERSION-OVERFLOW-GNU-NEXT: warning: '[[FILE]]': SHT_GNU_versym section refers to a version index 254 which is missing
+# VERSION-OVERFLOW-GNU-NEXT:     1: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT   UND foo@<corrupt>
+# VERSION-OVERFLOW-GNU-NEXT:     2: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT   UND bar@<corrupt
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_DYN
   Machine: EM_X86_64
 Sections:
   - Name:    .gnu.version
     Type:    SHT_GNU_versym
     Entries: [ 0xFF, 0xFE, 0xFF ]
 DynamicSymbols:
   - Name: foo
   - Name: bar

llvm/tools/llvm-readobj/llvm-readobj.cpp

 static StringRef ToolName;
 
 namespace llvm {
 
 LLVM_ATTRIBUTE_NORETURN static void error(Twine Msg) {
   // Flush the standard output to print the error at a
   // proper place.
   fouts().flush();
-  errs() << "\n";
   WithColor::error(errs(), ToolName) << Msg << "\n";
   exit(1);
 }
 
 LLVM_ATTRIBUTE_NORETURN void reportError(Error Err, StringRef Input) {
   assert(Err);
   if (Input == "-")
     Input = "<stdin>";
   handleAllErrors(createFileError(Input, std::move(Err)),
                   [&](const ErrorInfoBase &EI) { error(EI.message()); });
   llvm_unreachable("error() call should never return");
 }
 
 void reportWarning(Error Err, StringRef Input) {
   assert(Err);
   if (Input == "-")
     Input = "<stdin>";
 
   // Flush the standard output to print the warning at a
   // proper place.
   fouts().flush();
   handleAllErrors(
       createFileError(Input, std::move(Err)), [&](const ErrorInfoBase &EI) {
-        errs() << "\n";
         WithColor::warning(errs(), ToolName) << EI.message() << "\n";
       });
 }
 
 } // namespace llvm
 
 namespace {
 struct ReadObjTypeTableBuilder {