[llvm] b9ce8ea - [obj2yaml] Address D104035 review comments

[James Henderson via llvm-commits]

Author: James Henderson
Date: 2021-06-16T15:01:54+01:00
New Revision: b9ce8ea4542fdc57e34e23fc285752d899a01030

URL: https://github.com/llvm/llvm-project/commit/b9ce8ea4542fdc57e34e23fc285752d899a01030
DIFF: https://github.com/llvm/llvm-project/commit/b9ce8ea4542fdc57e34e23fc285752d899a01030.diff

LOG: [obj2yaml] Address D104035 review comments

Accidentally missed from commit 5c1639fe064b.

Differential Revision: https://reviews.llvm.org/D104035

Added: 
    

Modified: 
    llvm/lib/ObjectYAML/ELFEmitter.cpp
    llvm/test/tools/obj2yaml/ELF/shstrtab.yaml
    llvm/tools/obj2yaml/elf2yaml.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/ObjectYAML/ELFEmitter.cpp b/llvm/lib/ObjectYAML/ELFEmitter.cpp
index aa273a1c165e4..7890884711a88 100644
--- a/llvm/lib/ObjectYAML/ELFEmitter.cpp
+++ b/llvm/lib/ObjectYAML/ELFEmitter.cpp
@@ -1923,7 +1923,7 @@ bool ELFState<ELFT>::writeELF(raw_ostream &OS, ELFYAML::Object &Doc,
     return false;
 
   // Build the section index, which adds sections to the section header string
-  // table first, so that we can finalise the section header string table.
+  // table first, so that we can finalize the section header string table.
   State.buildSectionIndex();
   State.buildSymbolIndexes();
 

diff  --git a/llvm/test/tools/obj2yaml/ELF/shstrtab.yaml b/llvm/test/tools/obj2yaml/ELF/shstrtab.yaml
index c4c1874221785..daea0dc8f7d58 100644
--- a/llvm/test/tools/obj2yaml/ELF/shstrtab.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/shstrtab.yaml
@@ -23,8 +23,8 @@ FileHeader:
   Type:  ET_EXEC
   SectionHeaderStringTable: .foo
 
-## Show the case when the e_shstrndx value is 0 and the name is not ".shstrtab"
-## (the key should be set).
+## Show the case when the e_shstrndx value is SHN_XINDEX and the name is not
+## ".shstrtab" (the key should be set).
 # RUN: yaml2obj --docnum=2 %s -o %t2.o
 # RUN: obj2yaml %t2.o > %t2.yaml
 # RUN: FileCheck %s --input-file=%t2.yaml --check-prefix=XINDEX

diff  --git a/llvm/tools/obj2yaml/elf2yaml.cpp b/llvm/tools/obj2yaml/elf2yaml.cpp
index 97cb1f2508463..a72020fb752fe 100644
--- a/llvm/tools/obj2yaml/elf2yaml.cpp
+++ b/llvm/tools/obj2yaml/elf2yaml.cpp
@@ -517,7 +517,7 @@ Optional<DWARFYAML::Data> ELFDumper<ELFT>::dumpDWARFSections(
 
     if (ELFYAML::RawContentSection *RawSec =
             dyn_cast<ELFYAML::RawContentSection>(C.get())) {
-      // FIXME: The debugDebug* functions should take the content as stored in
+      // FIXME: The dumpDebug* functions should take the content as stored in
       // RawSec. Currently, they just use the last section with the matching
       // name, which defeats this attempt to skip reading a section header
       // string table with the same name as a DWARF section.