[obj2yaml] - Teach tool to dump SHT_NULL sections.

[grimar]

Summary

Recently an advanced support of SHT_NULL sections
was implemented in yaml2obj.

This patch adds a corresponding support to obj2yaml.

[grimar]

It contains parts of the D65214. I'll reupload.

[grimar]

• Now the diff is correct.

[MaskRay]

tools/obj2yaml/elf2yaml.cpp

245 ↗

(On Diff #211691)

if (&Sec == &Sections[0] && memchr(&Sec, 0, sizeof Sec) == nullptr)
  break;

[grimar]

tools/obj2yaml/elf2yaml.cpp

245 ↗

(On Diff #211691)

memchr searches for the first value, e.g. for the first 0 in your sample.
But I want to check here that all bytes in a range are '0', i.e. I need
to find the first non-zero value, it doesn't seem memchr can help here?

[MaskRay]

tools/obj2yaml/elf2yaml.cpp

245 ↗

(On Diff #211691)

Sorry about the memchr suggestion.. This part looks good.

if (&Sec == &Sections[0]) {

[grimar]

• Addressed review comment.
• Renamed the test case.

tools/obj2yaml/elf2yaml.cpp

245 ↗

(On Diff #211691)

Nevermind. I was also a bit confused about that there seems to be no any standart function for that.

[jhenderson]

test/tools/obj2yaml/elf-null-section.yaml

45 ↗

(On Diff #211707)

Nit: section with a non-zero index

88 ↗

(On Diff #211707)

"with index 0"

116 ↗

(On Diff #211707)

begining -> beginning

117 ↗

(On Diff #211707)

of the section list

any non-null fields.

[grimar]

• Addressed review comments.

[grimar]

Seems somehow I uploaded a diff from D65278 here last time. Sorry about that, I'll reupload the correct diff soon.

[grimar]

• Updated the diff.

test/tools/llvm-objcopy/ELF/binary-out-error.test

-# RUN: not llvm-objcopy -O binary %p/Inputs/alloc-symtab.o %t2 2>&1 >/dev/null | FileCheck %s --check-prefix=SYMTAB
+# RUN: yaml2obj %s -o %t
+# RUN: not llvm-objcopy -O binary %t - 2>&1 | FileCheck %s --check-prefix=SYMTAB
 # SYMTAB: cannot write symbol table '.symtab' out to binary
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_DYN
+  Machine: EM_X86_64
+Sections:
+  - Name: .symtab
+    Type: SHT_SYMTAB
+    Flags: [ SHF_ALLOC ]

test/tools/llvm-objcopy/ELF/invalid-preserve-dates.test

-## This tests for an expected error when --preserve dates is
+## This tests for an expected error when --preserve-dates is
 ## specified at the same time as using stdin or stdout as input or
 ## output files.
 
+# RUN: yaml2obj %s -o %t.foo
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_DYN
+  Machine: EM_X86_64
+...
+
 # RUN: not llvm-objcopy --preserve-dates - %t 2>&1 | FileCheck %s
-# RUN: not llvm-objcopy --preserve-dates %p/Inputs/alloc-symtab.o - 2>&1 | FileCheck %s
+# RUN: not llvm-objcopy --preserve-dates %t.foo - 2>&1 | FileCheck %s
 
-## Testing N args.
-# RUN: not llvm-strip --preserve-dates - < %p/Inputs/alloc-symtab.o 2>&1 | FileCheck %s
-# RUN: not llvm-strip --preserve-dates %p/Inputs/alloc-symtab.o - < \
-# RUN:      %p/Inputs/alloc-symtab.o 2>&1 | FileCheck %s
-# RUN: not llvm-strip --preserve-dates - %p/Inputs/alloc-symtab.o < \
-# RUN:      %p/Inputs/alloc-symtab.o 2>&1 | FileCheck %s
-# RUN: not llvm-strip --preserve-dates %p/Inputs/alloc-symtab.o - \
-# RUN:      %p/Inputs/alloc-symtab.o < %p/Inputs/alloc-symtab.o 2>&1 | FileCheck %s
+## Test that llvm-strip reports a proper error when --preserve-dates is specified
+## with one or more inputs, where one of them is stdin.
+# RUN: not llvm-strip --preserve-dates - < %t.foo 2>&1 | FileCheck %s
+# RUN: not llvm-strip --preserve-dates %t.foo - < %t.foo 2>&1 | FileCheck %s
+# RUN: not llvm-strip --preserve-dates - %t.foo < %t.foo 2>&1 | FileCheck %s
+# RUN: not llvm-strip --preserve-dates %t.foo - %t.foo < %t.foo 2>&1 | FileCheck %s
 
 ## Testing -o.
-# RUN: not llvm-strip --preserve-dates - -o %p/Inputs/alloc-symtab.o < \
-# RUN:      %p/Inputs/alloc-symtab.o 2>&1 | FileCheck %s
-# RUN: not llvm-strip --preserve-dates %p/Inputs/alloc-symtab.o -o - < \
-# RUN:      %p/Inputs/alloc-symtab.o 2>&1 | FileCheck %s
+# RUN: not llvm-strip --preserve-dates - -o %t.foo < %t.foo 2>&1 | FileCheck %s
+# RUN: not llvm-strip --preserve-dates %t.foo -o - < %t.foo 2>&1 | FileCheck %s
 
 # CHECK: error: --preserve-dates requires a file

test/tools/llvm-objcopy/ELF/standard-streams.test

-# RUN: llvm-objcopy - %t < %p/Inputs/alloc-symtab.o
-# RUN: llvm-objcopy %p/Inputs/alloc-symtab.o %t1
+# RUN: yaml2obj %s -o %t.foo
+
+# RUN: llvm-objcopy - %t < %t.foo
+# RUN: llvm-objcopy %t.foo %t1
 # RUN: cmp %t %t1
 
-# RUN: llvm-objcopy %p/Inputs/alloc-symtab.o - > %t2
+# RUN: llvm-objcopy %t.foo - > %t2
 # RUN: cmp %t1 %t2
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_DYN
+  Machine: EM_X86_64

test/tools/llvm-objcopy/ELF/strict-no-add.test

 # This test makes sure that sections added at the end that don't have symbols
 # defined in them don't trigger the creation of a large index table.
 
 RUN: %python %p/../Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t.0
-RUN: cat %p/Inputs/alloc-symtab.o > %t
+RUN: echo 'foo' > %t
 RUN: llvm-objcopy -R .text -R s0 -R s1 -R s2 -R s3 -R s4 -R s5 -R s6 %t.0 %t2
 RUN: llvm-objcopy --add-section=.s0=%t --add-section=.s1=%t --add-section=.s2=%t %t2 %t2
 RUN: llvm-readobj --sections %t2 | FileCheck --check-prefix=SECS %s
 
 SECS-NOT: Name: .symtab_shndx