[ObjectYAML][DWARF] Support emitting .debug_ranges section in ELFYAML.

[Higuoxing]

Summary

This patch enables yaml2elf to emit the .debug_ranges section.

[Higuoxing]

Remove one blank line.

[jhenderson]

Thanks. A number of relatively minor test comments only from me.

llvm/test/tools/yaml2obj/ELF/DWARF/debug-ranges.yaml

12–23

Nit: you need an extra space to make these line up with the CONTENT checks.

24

You can make this DWARF-LE-CONTENT-NEXT since it should follow the EntrySize (or you can add extra directives to make it do so). Same goes for the big endian version.

163

Nit: It doesn't matter much, but I'd make AddrSize: 0x8 from here on, since it is the natural address size of X86_64

165–166

I'd avoid using 0 for both high and low, since that is a special meaning for .debug_ranges. Perhaps 1 and 2 would be better. Also, perhaps worth an extra case showing that a) 0, 0 can be used explicitly, and that b) 0xffffffffffffffff, <something> can be used too, since those are both special kinds of entries in the table. You could put them in the original pair of tests if you want, or in a new case, whichever you prefer.

215–216

Nit: don't pad your numbers with leading zeros unless necessary (I don't think it is necessary here). Same goes throughout.

[Higuoxing]

Address comments:

• Remove unneeded padding zeros.
• Add two special entries (0xffffffff, Base Address), (0x00000000, 0x00000000) to test (a).

[jhenderson]

LGTM, with one remaining suggestion.

llvm/test/tools/yaml2obj/ELF/DWARF/debug-ranges.yaml

215–216

Up to you, but the "don't pad unnecessarily" comment also applies to these addresse and the AddrSize field in this and the other examples. I don't mind if you think it's useful to have them there though.

llvm/lib/ObjectYAML/DWARFYAML.cpp

 }
 
 SetVector<StringRef> DWARFYAML::Data::getUsedSectionNames() const {
   SetVector<StringRef> SecNames;
   if (!DebugStrings.empty())
     SecNames.insert("debug_str");
   if (!ARanges.empty())
     SecNames.insert("debug_aranges");
+  if (!DebugRanges.empty())
+    SecNames.insert("debug_ranges");
   return SecNames;
 }
 
 namespace yaml {
 
 void MappingTraits<DWARFYAML::Data>::mapping(IO &IO, DWARFYAML::Data &DWARF) {
   auto oldContext = IO.getContext();
   IO.setContext(&DWARF);

llvm/lib/ObjectYAML/ELFEmitter.cpp

 template <class ELFT>
 uint64_t emitDWARF(typename ELFT::Shdr &SHeader, StringRef Name,
                    const DWARFYAML::Data &DWARF, raw_ostream &OS) {
   uint64_t BeginOffset = OS.tell();
   if (Name == ".debug_str")
     DWARFYAML::EmitDebugStr(OS, DWARF);
   else if (Name == ".debug_aranges")
     DWARFYAML::EmitDebugAranges(OS, DWARF);
+  else if (Name == ".debug_ranges")
+    DWARFYAML::EmitDebugRanges(OS, DWARF);
   else
     llvm_unreachable("unexpected emitDWARF() call");
 
   return OS.tell() - BeginOffset;
 }
 
 template <class ELFT>
 void ELFState<ELFT>::initDWARFSectionHeader(Elf_Shdr &SHeader, StringRef Name,

llvm/test/tools/yaml2obj/ELF/DWARF/debug-ranges.yaml

+## Test that yaml2obj emits .debug_ranges section.
+
+## a) Generate the .debug_ranges section from the "DWARF" entry.
+
+## Generate and verify a little endian .debug_ranges section.
+
+# RUN: yaml2obj --docnum=1 -DENDIAN=ELFDATA2LSB %s -o %t.le.o
+# RUN: llvm-readobj --sections --section-data %t.le.o | \
+# RUN:   FileCheck %s -DSIZE=120 -DADDRALIGN=1 --check-prefixes=DWARF-HEADER,DWARF-LE-CONTENT
+
+#          DWARF-HEADER: Index: 1
+#     DWARF-HEADER-NEXT: Name: .debug_ranges (1)
+#     DWARF-HEADER-NEXT: Type: SHT_PROGBITS (0x1)
+#     DWARF-HEADER-NEXT: Flags [ (0x0)
+#     DWARF-HEADER-NEXT: ]
+#     DWARF-HEADER-NEXT: Address: 0x0
+#     DWARF-HEADER-NEXT: Offset: 0x40
+#     DWARF-HEADER-NEXT: Size: [[SIZE]]
+#     DWARF-HEADER-NEXT: Link: 0
+#     DWARF-HEADER-NEXT: Info: 0
+#     DWARF-HEADER-NEXT: AddressAlignment: [[ADDRALIGN]]
+#     DWARF-HEADER-NEXT: EntrySize: 0
+# DWARF-LE-CONTENT-NEXT: SectionData (
+# DWARF-LE-CONTENT-NEXT:   0000: 10000000 20000000 30000000 40000000
+##                               |        |        |        |
+##                               |        |        |        +------- HighOffset (4-byte) 0x40
+##                               |        |        +------- LowOffset (4-byte) 0x30
+##                               |        +------- HighOffset (4-byte) 0x20
+##                               +------- LowOffset (4-byte) 0x10
+##
+# DWARF-LE-CONTENT-NEXT:   0010: FFFFFFFF 10000000 00000000 00000000
+##                               |        |        |        |
+##                               |        |        |        +------- HighOffset (4-byte) 0x00
+##                               |        |        +------- LowOffset (4-byte) 0x00
+##                               |        +------- Base Address (4-byte) 0x10
+##                               +------- Base Address Entry (4-byte) UINT32_MAX
+##
+# DWARF-LE-CONTENT-NEXT:   0020: 00000000 00000000 10000000 00000000
+##                               |                 |
+##                               |                 +---------------- LowOffset (8-byte) 0x10
+##                               +---------------- Terminating Entry (8-byte)
+##
+# DWARF-LE-CONTENT-NEXT:   0030: 20000000 00000000 30000000 00000000
+##                               |                 |
+##                               |                 +---------------- LowOffset (8-byte) 0x30
+##                               +---------------- HighOffset (8-byte) 0x20
+##
+# DWARF-LE-CONTENT-NEXT:   0040: 40000000 00000000 FFFFFFFF FFFFFFFF
+##                               |                 |
+##                               |                 +---------------- Base Address Entry (8-byte) UINT64_MAX
+##                               +---------------- HighOffset (8-byte) 0x40
+##
+# DWARF-LE-CONTENT-NEXT:   0050: 10000000 00000000 00000000 00000000
+##                               |                 |
+##                               |                 +---------------- LowOffset (8-byte) 0x00
+##                               +---------------- Base Address (8-byte) 0x10
+##
+# DWARF-LE-CONTENT-NEXT:   0060: 00000000 00000000 00000000 00000000
+##                               |                 |
+##                               |                 +---------------- Terminating Entry (16-byte)
+##                               +---------------- HighOffset (8-byte) 0x00
+##
+# DWARF-LE-CONTENT-NEXT:   0070: 00000000 00000000
+##                               |
+##                               +---------------- Terminating Entry (lower 8-byte)
+##
+# DWARF-LE-CONTENT-NEXT: )
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    [[ENDIAN]]
+  Type:    ET_EXEC
+  Machine: EM_X86_64
+DWARF:
+  debug_ranges:
+    - Offset:   0
+      AddrSize: 0x04
+      Entries:
+        - LowOffset:  0x00000010
+          HighOffset: 0x00000020
+        - LowOffset:  0x00000030
+          HighOffset: 0x00000040
+        - LowOffset:  0xffffffff
+          HighOffset: 0x00000010
+        - LowOffset:  0x00000000
+          HighOffset: 0x00000000
+    - Offset:   40
+      AddrSize: 0x08
+      Entries:
+        - LowOffset:  0x0000000000000010
+          HighOffset: 0x0000000000000020
+        - LowOffset:  0x0000000000000030
+          HighOffset: 0x0000000000000040
+        - LowOffset:  0xffffffffffffffff
+          HighOffset: 0x0000000000000010
+        - LowOffset:  0x0000000000000000
+          HighOffset: 0x0000000000000000
+
+## Generate and verify a big endian .debug_ranges section.
+
+# RUN: yaml2obj --docnum=1 -DENDIAN=ELFDATA2MSB %s -o %t.be.o
+# RUN: llvm-readobj --sections --section-data %t.be.o | \
+# RUN:   FileCheck %s -DSIZE=120 -DADDRALIGN=1 --check-prefixes=DWARF-HEADER,DWARF-BE-CONTENT
+
+# DWARF-BE-CONTENT-NEXT: SectionData (
+# DWARF-BE-CONTENT-NEXT: 0000: 00000010 00000020 00000030 00000040
+##                             |        |        |        |
+##                             |        |        |        +------- HighOffset (4-byte) 0x40
+##                             |        |        +------- LowOffset (4-byte) 0x30
+##                             |        +------- HighOffset (4-byte) 0x20
+##                             +------- LowOffset (4-byte) 0x10
+##
+# DWARF-BE-CONTENT-NEXT: 0010: FFFFFFFF 00000010 00000000 00000000
+##                             |        |        |        |
+##                             |        |        |        +------- HighOffset (4-byte) 0x00
+##                             |        |        +------- LowOffset (4-byte) 0x00
+##                             |        +------- Base Address (4-byte) 0x10
+##                             +------- Base Address Entry (4-byte) UINT32_MAX
+##
+# DWARF-BE-CONTENT-NEXT: 0020: 00000000 00000000 00000000 00000010
+##                             |                 |
+##                             |                 +---------------- LowOffset (8-byte) 0x10
+##                             +---------------- Terminating Entry (8-byte)
+##
+# DWARF-BE-CONTENT-NEXT: 0030: 00000000 00000020 00000000 00000030
+##                             |                 |
+##                             |                 +---------------- LowOffset (8-byte) 0x30
+##                             +---------------- HighOffset (8-byte) 0x20
+##
+# DWARF-BE-CONTENT-NEXT: 0040: 00000000 00000040 FFFFFFFF FFFFFFFF
+##                             |                 |
+##                             |                 +---------------- Base Address Entry (8-byte) UINT64_MAX
+##                             +---------------- HighOffset (8-byte) 0x40
+##
+# DWARF-BE-CONTENT-NEXT: 0050: 00000000 00000010 00000000 00000000
+##                             |                 |
+##                             |                 +---------------- LowOffset (8-byte) 0x00
+##                             +---------------- Base Address (8-byte) 0x10
+##
+# DWARF-BE-CONTENT-NEXT: 0060: 00000000 00000000 00000000 00000000
+##                             |                 |
+##                             |                 +---------------- Terminating Entry (16-byte)
+##                             +---------------- HighOffset (8-byte) 0x00
+##
+# DWARF-BE-CONTENT-NEXT: 0070: 00000000 00000000
+##                             |
+##                             +---------------- Terminating Entry (lower 8-byte)
+##
+# DWARF-BE-CONTENT-NEXT: )
+
+## b) Generate the .debug_ranges section from raw section content.
+
+# RUN: yaml2obj --docnum=2 %s -o %t2.o
+# RUN: llvm-readobj --sections --section-data %t2.o | \
+# RUN:   FileCheck %s -DSIZE=3 -DADDRALIGN=0 --check-prefixes=DWARF-HEADER,ARBITRARY-CONTENT
+
+#      ARBITRARY-CONTENT: SectionData (
+# ARBITRARY-CONTENT-NEXT:   0000: 112233
+# ARBITRARY-CONTENT-NEXT: )
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_EXEC
+  Machine: EM_X86_64
+Sections:
+  - Name:    .debug_ranges
+    Type:    SHT_PROGBITS
+    Content: "112233"
+
+## c) Generate the .debug_ranges section when the "Size" is specified.
+
+# RUN: yaml2obj --docnum=3 %s -o %t3.o
+# RUN: llvm-readobj --hex-dump=.debug_ranges %t3.o | FileCheck %s --check-prefix=SIZE
+
+#       SIZE: Hex dump of section '.debug_ranges':
+#  SIZE-NEXT: 0x00000000 00000000 00000000 00000000 00000000 ................
+# SIZE-EMPTY:
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_EXEC
+  Machine: EM_X86_64
+Sections:
+  - Name: .debug_ranges
+    Type: SHT_PROGBITS
+    Size: 0x10
+
+## d) Test that yaml2obj emits an error message when both the "Size" and the
+## "debug_ranges" entry are specified at the same time.
+
+# RUN: not yaml2obj --docnum=4 %s 2>&1 | FileCheck %s --check-prefix=ERROR
+
+# ERROR: yaml2obj: error: cannot specify section '.debug_ranges' contents in the 'DWARF' entry and the 'Content' or 'Size' in the 'Sections' entry at the same time
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_EXEC
+  Machine: EM_X86_64
+Sections:
+  - Name: .debug_ranges
+    Type: SHT_PROGBITS
+    Size: 0x10
+DWARF:
+  debug_ranges:
+    - Offset:   0
+      AddrSize: 0x08
+      Entries:
+        - LowOffset:  0x0000000000000001
+          HighOffset: 0x0000000000000002
+
+## e) Test that yaml2obj emits an error message when both the "Content" and the
+## "debug_ranges" entry are specified at the same time.
+
+# RUN: not yaml2obj --docnum=5 %s 2>&1 | FileCheck %s --check-prefix=ERROR
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_EXEC
+  Machine: EM_X86_64
+Sections:
+  - Name:    .debug_ranges
+    Type:    SHT_PROGBITS
+    Content: "00"
+DWARF:
+  debug_ranges:
+    - Offset:   0
+      AddrSize: 0x08
+      Entries:
+        - LowOffset:  0x0000000000000001
+          HighOffset: 0x0000000000000002
+
+## f) Test that all the properties can be overridden by the section header when
+## the "debug_ranges" entry doesn't exist.
+
+# RUN: yaml2obj --docnum=6 %s -o %t6.o
+# RUN: llvm-readelf --sections %t6.o | FileCheck %s --check-prefix=OVERRIDDEN
+
+#      OVERRIDDEN: [Nr] Name          Type   Address          Off    Size   ES Flg Lk Inf Al
+#      OVERRIDDEN: [ 1] .debug_ranges STRTAB 0000000000002020 000050 000020 01   A  2   1  2
+# OVERRIDDEN-NEXT: [ 2] .sec          STRTAB 0000000000000000 000070 000000 00      0   0  0
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_EXEC
+  Machine: EM_X86_64
+Sections:
+  - Name:         .debug_ranges
+    Type:         SHT_STRTAB  # SHT_PROGBITS by default.
+    Flags:        [SHF_ALLOC] # 0 by default.
+    Link:         .sec        # 0 by default.
+    EntSize:      1           # 0 by default.
+    Info:         1           # 0 by default.
+    AddressAlign: 2           # 0 by default.
+    Address:      0x2020      # 0x00 by default.
+    Offset:       0x50        # 0x40 for the first section.
+    Size:         0x20        # Set the "Size" so that we can reuse the check tag "OVERRIDDEN".
+  - Name:         .sec        # Linked by .debug_ranges.
+    Type:         SHT_STRTAB
+
+## g) Test that all the properties can be overridden by the section header when
+## the "debug_ranges" entry exists.
+
+# RUN: yaml2obj --docnum=7 %s -o %t7.o
+# RUN: llvm-readelf --sections %t7.o | FileCheck %s --check-prefix=OVERRIDDEN
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_EXEC
+  Machine: EM_X86_64
+Sections:
+  - Name:         .debug_ranges
+    Type:         SHT_STRTAB  # SHT_PROGBITS by default.
+    Flags:        [SHF_ALLOC] # 0 by default.
+    Link:         .sec        # 0 by default.
+    EntSize:      1           # 0 by default.
+    Info:         1           # 0 by default.
+    AddressAlign: 2           # 1 by default.
+    Address:      0x2020      # 0x00 by default.
+    Offset:       0x50        # 0x40 for the first section.
+  - Name:         .sec        # Linked by .debug_ranges.
+    Type:         SHT_STRTAB
+DWARF:
+  debug_ranges:
+    - Offset:   0
+      AddrSize: 0x08
+      Entries:
+        - LowOffset:  0x0000000000000001
+          HighOffset: 0x0000000000000002
+
+## h) Test that yaml2obj will not generate the .debug_ranges section when the "DWARF" entry
+## exists but the "debug_ranges" entry doesn't exist in the "DWARF" entry or the "Sections" entry.
+
+# RUN: yaml2obj --docnum=8 %s -o %t8.o
+# RUN: llvm-readelf --sections %t8.o | FileCheck /dev/null --implicit-check-not=.debug_ranges
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_EXEC
+  Machine: EM_X86_64
+DWARF: