[obj2yaml] - Match ".stack_size" with the original section name, and not the uniquified name.

[rahmanl]

Summary

Without this patch, obj2yaml decodes the content of only one ".stack_size" section. Other sections are dumped with their full contents.

[grimar]

LGTM, thanks!

[grimar]

nit: add a "[obj2yaml]" prefix to the patch name:

[obj2yaml] - Match ".stack_size" with the original section name, and not the uniquified name.

[jhenderson]

llvm/test/tools/obj2yaml/ELF/stack-sizes.yaml

122

Can we use Entries: instead of raw content for the input too? (Same below)

[rahmanl]

Use "Entries:" instead of "Content:" in test.

[rahmanl]

• Rebase with upstream.

[thakis]

Looks like this doesn't build: http://45.33.8.238/linux/27982/step_4.txt

[MaskRay]

@rahmanl This conflicts with D87385. Please re-check before committing.

[rahmanl]

• Change the getSectionName call to pass pointer.

[MaskRay]

For a reverted revision, you can click "Add Action" - "Reopen Revision" followed by "Request Changes". There is usually no need creating a new one unless the new patch undergoes a very large refactoring.

Make sure you commit has Differential Revision: https://reviews.llvm.org/D87727 and arc diff 'HEAD^' can upload a new diff.

[rahmanl]

Sorry about the headache @MaskRay I should've built after rebasing.

[MaskRay]

In D87727#2277529, @rahmanl wrote:

Sorry about the headache @MaskRay I should've built after rebasing.

No problem! There are 100 commits every day and a previous test can easily get stale after, say, 6 hours.
And for a revert (e.g. f80f2516a2697218eeb7af80de3b13c38f342987), please mention the reason why it was reverted (it caused compilation issues. Even better it could have mentioned that it conflicted with a previous commit) (And a revert should be tested as well, sometimes a revert can cause new problems)

[rahmanl]

@MaskRay ping.

[MaskRay]

LGTM.

llvm/test/tools/obj2yaml/ELF/stack-sizes.yaml

 FileHeader:
   Class: ELFCLASS64
   Data:  ELFDATA2LSB
   Type:  ET_EXEC
 Sections:
   - Name:    .stack_sizes
     Type:    SHT_PROGBITS
     Content: ""
+
+## Check obj2yaml can dump multiple .stack_sizes.
+
+# RUN: yaml2obj --docnum=4 %s -o %t4
+# RUN: obj2yaml %t4 | FileCheck %s --check-prefix=MULTI
+
+# MULTI:      --- !ELF
+# MULTI-NEXT: FileHeader:
+# MULTI-NEXT:   Class:   ELFCLASS64
+# MULTI-NEXT:   Data:    ELFDATA2LSB
+# MULTI-NEXT:   Type:    ET_EXEC
+# MULTI-NEXT:   Machine: EM_NONE
+# MULTI-NEXT: Sections:
+# MULTI-NEXT:   - Name:    .stack_sizes
+# MULTI-NEXT:     Type:    SHT_PROGBITS
+# MULTI-NEXT:     Entries:
+# MULTI-NEXT:       - Address: 0x0000000000000010
+# MULTI-NEXT:         Size:    0x0000000000000020
+# MULTI-NEXT:       - Address: 0x0000000000000030
+# MULTI-NEXT:         Size:    0x0000000000000040
+# MULTI-NEXT:   - Name:    '.stack_sizes (1)'
+# MULTI-NEXT:     Type:    SHT_PROGBITS
+# MULTI-NEXT:     Entries:
+# MULTI-NEXT:       - Address: 0x0000000000000050
+# MULTI-NEXT:         Size:    0x0000000000000001
+# MULTI-NEXT:       - Address: 0x0000000000000060
+# MULTI-NEXT:         Size:    0x0000000000000002
+
+--- !ELF
+FileHeader:
+  Class: ELFCLASS64
+  Data:  ELFDATA2LSB
+  Type:  ET_EXEC
+Sections:
+  - Name:    .stack_sizes
+    Type:    SHT_PROGBITS
+    Entries:
+      - Address: 0x0000000000000010
+        Size:    0x0000000000000020
+      - Address: 0x0000000000000030
+        Size:    0x0000000000000040
+  - Name:    '.stack_sizes (1)'
+    Type:    SHT_PROGBITS
+    Entries:
+      - Address: 0x0000000000000050
+        Size:    0x0000000000000001
+      - Address: 0x0000000000000060
+        Size:    0x0000000000000002

llvm/tools/obj2yaml/elf2yaml.cpp

if (std::function<Expected<ELFYAML::Chunk *>(const Elf_Shdr *)> DumpFn =
             GetDumper(Sec.sh_type)) {
       if (Error E = Add(DumpFn(&Sec)))
         return std::move(E);
       continue;
     }
 
     // Recognize some special SHT_PROGBITS sections by name.
     if (Sec.sh_type == ELF::SHT_PROGBITS) {
-      auto NameOrErr = getUniquedSectionName(&Sec);
+      auto NameOrErr = Obj.getSectionName(&Sec);
       if (!NameOrErr)
         return NameOrErr.takeError();
 
       if (ELFYAML::StackSizesSection::nameMatches(*NameOrErr)) {
         if (Error E = Add(dumpStackSizesSection(&Sec)))
           return std::move(E);
         continue;
       }