[DWARFYAML][debug_info] Replace 'InitialLength' with 'Format' and 'Length'.

[Higuoxing]

Summary

'InitialLength' is replaced with 'Format' (DWARF32 by default) and 'Length' in this patch.
Besides, test cases for DWARFv4 and DWARFv5, DWARF32 and DWARF64 is
added.

[Higuoxing]

Prettify test cases.

[jhenderson]

LGTM. Well done on catching the lldb failures - I don't even build lldb by default personally.

llvm/test/ObjectYAML/MachO/DWARF-debug_info.yaml

515–698

Any particular reason you've dropped the DWARF: tag? Having it back would help make the diff a little simpler, I'd hope.

llvm/test/ObjectYAML/MachO/DWARF5-debug_info.yaml

1–7

generating -> generating a

[Higuoxing]

Thanks for reviewing!

llvm/test/ObjectYAML/MachO/DWARF-debug_info.yaml

515–698

Because the first tag after "DWARF:" is "debug_abbrev". I will bring it back later.

[Higuoxing]

Address comments.

[jhenderson]

Forgot to mark as accepted before, but one more comment to add.

llvm/test/ObjectYAML/MachO/DWARF-debug_info.yaml

515–698

I didn't realise it wasn't on the next line. In that case, I'm happy for it to be deleted. Alternatively, you should add it to the DWARF64 case too.

[uweigand]

This commit causes test case failures on s390x (unfortunately hidden as the build bot was already red due to an unrelated issue):
http://lab.llvm.org:8011/builders/clang-s390x-linux/builds/33624

http://lab.llvm.org:8011/builders/clang-s390x-linux/builds/33624/steps/ninja%20check%201/logs/FAIL%3A%20LLVM%3A%3ADWARF-debug_info.yaml

At first glance, seems like this could be endian-related?

[Higuoxing]

In D82622#2122562, @uweigand wrote:

This commit causes test case failures on s390x (unfortunately hidden as the build bot was already red due to an unrelated issue):
http://lab.llvm.org:8011/builders/clang-s390x-linux/builds/33624

http://lab.llvm.org:8011/builders/clang-s390x-linux/builds/33624/steps/ninja%20check%201/logs/FAIL%3A%20LLVM%3A%3ADWARF-debug_info.yaml

At first glance, seems like this could be endian-related?

Yes, if we don't specify the endianness in YAML, yaml2macho will emit binaries that have the same endianness as the host machine. I'll fix it. Thanks a lot!

[Higuoxing]

In D82622#2122562, @uweigand wrote:

This commit causes test case failures on s390x (unfortunately hidden as the build bot was already red due to an unrelated issue):
http://lab.llvm.org:8011/builders/clang-s390x-linux/builds/33624

http://lab.llvm.org:8011/builders/clang-s390x-linux/builds/33624/steps/ninja%20check%201/logs/FAIL%3A%20LLVM%3A%3ADWARF-debug_info.yaml

At first glance, seems like this could be endian-related?

The failed tests are removed in 8032727a43ca678b0b923abaa04638f500a060d6. Thanks.

[uweigand]

In D82622#2122708, @Higuoxing wrote:

In D82622#2122562, @uweigand wrote:

This commit causes test case failures on s390x (unfortunately hidden as the build bot was already red due to an unrelated issue):
http://lab.llvm.org:8011/builders/clang-s390x-linux/builds/33624

http://lab.llvm.org:8011/builders/clang-s390x-linux/builds/33624/steps/ninja%20check%201/logs/FAIL%3A%20LLVM%3A%3ADWARF-debug_info.yaml

At first glance, seems like this could be endian-related?

The failed tests are removed in 8032727a43ca678b0b923abaa04638f500a060d6. Thanks.

Thanks, the build bot is now green again!

lldb/test/API/functionalities/source-map/a.yaml

- Code:            0x00000005
           Form:            DW_FORM_ref4
     - Code:            0x00000006
       Tag:             DW_TAG_const_type
       Children:        DW_CHILDREN_no
       Attributes:      
         - Attribute:       DW_AT_type
           Form:            DW_FORM_ref4
   debug_info:      
-    - Length:          
-        TotalLength:     122
+    - Length:          122
       Version:         4
       AbbrOffset:      0
       AddrSize:        8
       Entries:         
         - AbbrCode:        0x00000001
           Values:          
             - Value:           0x0000000000000000
             - Value:           0x000000000000000C

lldb/unittests/Expression/DWARFExpressionTest.cpp

 //===-- DWARFExpressionTest.cpp -------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Expression/DWARFExpression.h"
 #include "Plugins/TypeSystem/Clang/TypeSystemClang.h"
 #include "TestingSupport/Symbol/YAMLModuleTester.h"
 #include "lldb/Core/Value.h"
 #include "lldb/Core/dwarf.h"
 #include "lldb/Symbol/ObjectFile.h"
 #include "lldb/Utility/StreamString.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Testing/Support/Error.h"
const char *yamldata =
       "    Tag:             DW_TAG_base_type\n"
       "    Children:        DW_CHILDREN_no\n"
       "    Attributes:\n"
       "      - Attribute:       DW_AT_encoding\n"
       "        Form:            DW_FORM_data1\n"
       "      - Attribute:       DW_AT_byte_size\n"
       "        Form:            DW_FORM_data1\n"
       "debug_info:\n"
-      "  - Length:\n"
-      "      TotalLength:     0\n"
+      "  - Length:          0\n"
       "    Version:         4\n"
       "    AbbrOffset:      0\n"
       "    AddrSize:        8\n"
       "    Entries:\n"
       "      - AbbrCode:        0x00000001\n"
       "        Values:\n"
       "          - Value:           0x000000000000000C\n"
       // 0x0000000e:

lldb/unittests/Symbol/Inputs/inlined-functions.yaml

- Code:            0x0000000C
           Form:            DW_FORM_ref4
     - Code:            0x0000000D
       Tag:             DW_TAG_pointer_type
       Children:        DW_CHILDREN_no
       Attributes:      
         - Attribute:       DW_AT_type
           Form:            DW_FORM_ref4
   debug_info:      
-    - Length:          
-        TotalLength:     579
+    - Length:          579
       Version:         4
       AbbrOffset:      0
       AddrSize:        8
       Entries:         
         - AbbrCode:        0x00000001
           Values:          
             - Value:           0x0000000000000000
             - Value:           0x0000000000000004

lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp

 //===-- DWARFASTParserClangTests.cpp --------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "Plugins/SymbolFile/DWARF/DWARFASTParserClang.h"
 #include "Plugins/SymbolFile/DWARF/DWARFCompileUnit.h"
 #include "Plugins/SymbolFile/DWARF/DWARFDIE.h"
 #include "TestingSupport/Symbol/YAMLModuleTester.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
 using namespace lldb;
 using namespace lldb_private;
const char *yamldata =
       "    Tag:             DW_TAG_base_type\n"
       "    Children:        DW_CHILDREN_no\n"
       "    Attributes:\n"
       "      - Attribute:       DW_AT_encoding\n"
       "        Form:            DW_FORM_data1\n"
       "      - Attribute:       DW_AT_byte_size\n"
       "        Form:            DW_FORM_data1\n"
       "debug_info:\n"
-      "  - Length:\n"
-      "      TotalLength:     0\n"
+      "  - Length:          0\n"
       "    Version:         4\n"
       "    AbbrOffset:      0\n"
       "    AddrSize:        8\n"
       "    Entries:\n"
       "      - AbbrCode:        0x00000001\n"
       "        Values:\n"
       "          - Value:           0x000000000000000C\n"
       // 0x0000000e:

llvm/include/llvm/ObjectYAML/DWARFYAML.h

 };
 
 struct Entry {
   llvm::yaml::Hex32 AbbrCode;
   std::vector<FormValue> Values;
 };
 
 struct Unit {
-  InitialLength Length;
+  dwarf::DwarfFormat Format;
+  uint64_t Length;
   uint16_t Version;
   llvm::dwarf::UnitType Type; // Added in DWARF 5
   yaml::Hex64 AbbrOffset;
   uint8_t AddrSize;
   std::vector<Entry> Entries;
 };
 
 struct File {

llvm/lib/ObjectYAML/DWARFEmitter.cpp

 namespace {
 /// An extension of the DWARFYAML::ConstVisitor which writes compile
 /// units and DIEs to a stream.
 class DumpVisitor : public DWARFYAML::ConstVisitor {
   raw_ostream &OS;
 
 protected:
   void onStartCompileUnit(const DWARFYAML::Unit &CU) override {
-    writeInitialLength(CU.Length, OS, DebugInfo.IsLittleEndian);
+    writeInitialLength(CU.Format, CU.Length, OS, DebugInfo.IsLittleEndian);
     writeInteger((uint16_t)CU.Version, OS, DebugInfo.IsLittleEndian);
     if (CU.Version >= 5) {
       writeInteger((uint8_t)CU.Type, OS, DebugInfo.IsLittleEndian);
       writeInteger((uint8_t)CU.AddrSize, OS, DebugInfo.IsLittleEndian);
       cantFail(writeVariableSizedInteger(CU.AbbrOffset,
-                                         CU.Length.isDWARF64() ? 8 : 4, OS,
-                                         DebugInfo.IsLittleEndian));
+                                         CU.Format == dwarf::DWARF64 ? 8 : 4,
+                                         OS, DebugInfo.IsLittleEndian));
     } else {
       cantFail(writeVariableSizedInteger(CU.AbbrOffset,
-                                         CU.Length.isDWARF64() ? 8 : 4, OS,
-                                         DebugInfo.IsLittleEndian));
+                                         CU.Format == dwarf::DWARF64 ? 8 : 4,
+                                         OS, DebugInfo.IsLittleEndian));
       writeInteger((uint8_t)CU.AddrSize, OS, DebugInfo.IsLittleEndian);
     }
   }
 
   void onStartDIE(const DWARFYAML::Unit &CU,
                   const DWARFYAML::Entry &DIE) override {
     encodeULEB128(DIE.AbbrCode, OS);
   }
public:
   DIEFixupVisitor(DWARFYAML::Data &DI) : DWARFYAML::Visitor(DI){};
 
 private:
   virtual void onStartCompileUnit(DWARFYAML::Unit &CU) {
     // Size of the unit header, excluding the length field itself.
     Length = CU.Version >= 5 ? 8 : 7;
   }
 
-  virtual void onEndCompileUnit(DWARFYAML::Unit &CU) {
-    CU.Length.setLength(Length);
-  }
+  virtual void onEndCompileUnit(DWARFYAML::Unit &CU) { CU.Length = Length; }
 
   virtual void onStartDIE(DWARFYAML::Unit &CU, DWARFYAML::Entry &DIE) {
     Length += getULEB128Size(DIE.AbbrCode);
   }
 
   virtual void onValue(const uint8_t U) { Length += 1; }
   virtual void onValue(const uint16_t U) { Length += 2; }
   virtual void onValue(const uint32_t U) { Length += 4; }

llvm/lib/ObjectYAML/DWARFVisitor.cpp

 //===--- DWARFVisitor.cpp ---------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 //===----------------------------------------------------------------------===//
 
 #include "DWARFVisitor.h"
+#include "llvm/BinaryFormat/Dwarf.h"
 #include "llvm/ObjectYAML/DWARFYAML.h"
 #include "llvm/Support/Errc.h"
 #include "llvm/Support/Error.h"
 
 using namespace llvm;
 
 template <typename T>
 void DWARFYAML::VisitorImpl<T>::onVariableSizeValue(uint64_t U, unsigned Size) {
case 1:
     onValue((uint8_t)U);
     break;
   default:
     llvm_unreachable("Invalid integer write size.");
   }
 }
 
 static unsigned getOffsetSize(const DWARFYAML::Unit &Unit) {
-  return Unit.Length.isDWARF64() ? 8 : 4;
+  return Unit.Format == dwarf::DWARF64 ? 8 : 4;
 }
 
 static unsigned getRefSize(const DWARFYAML::Unit &Unit) {
   if (Unit.Version == 2)
     return Unit.AddrSize;
   return getOffsetSize(Unit);
 }
 

llvm/lib/ObjectYAML/DWARFYAML.cpp

void MappingTraits<DWARFYAML::PubSection>::mapping(
   IO.mapRequired("UnitOffset", Section.UnitOffset);
   IO.mapRequired("UnitSize", Section.UnitSize);
   IO.mapRequired("Entries", Section.Entries);
 
   IO.setContext(OldContext);
 }
 
 void MappingTraits<DWARFYAML::Unit>::mapping(IO &IO, DWARFYAML::Unit &Unit) {
+  IO.mapOptional("Format", Unit.Format, dwarf::DWARF32);
   IO.mapRequired("Length", Unit.Length);
   IO.mapRequired("Version", Unit.Version);
   if (Unit.Version >= 5)
     IO.mapRequired("UnitType", Unit.Type);
   IO.mapRequired("AbbrOffset", Unit.AbbrOffset);
   IO.mapRequired("AddrSize", Unit.AddrSize);
   IO.mapOptional("Entries", Unit.Entries);
 }

llvm/test/ObjectYAML/MachO/DWARF-debug_info.yaml

-# RUN: yaml2obj %s | obj2yaml | FileCheck %s
+## This file contains test cases for generating .debug_info
+## section in object files from the DWARF entry of Mach-O YAML inputs.
+
+## a) Test that yaml2obj emits a DWARF32 .debug_info sections and obj2yaml
+## converts it back.
+
+# RUN: yaml2obj --docnum=1 %s | obj2yaml | FileCheck %s --check-prefix=DWARF32
 
 --- !mach-o
 FileHeader:      
   magic:           0xFEEDFACF
   cputype:         0x01000007
   cpusubtype:      0x00000003
   filetype:        0x0000000A
   ncmds:           5
- Length:          44
       Version:         2
       CuOffset:        0
       AddrSize:        8
       SegSize:         0
       Descriptors:     
         - Address:         0x0000000100000F50
           Length:          52
   debug_info:      
-    - Length:          
-        TotalLength:     117
+    - Length:          117
       Version:         4
       AbbrOffset:      0
       AddrSize:        8
       Entries:         
         - AbbrCode:        0x00000001
           Values:          
             - Value:           0x0000000000000001
             - Value:           0x000000000000000C
- Length:          65
         - Opcode:          DW_LNS_extended_op
           ExtLen:          1
           SubOpcode:       DW_LNE_end_sequence
           Data:            11
 ...
 ...
 
 
-#CHECK: DWARF:           
-#CHECK:   debug_info:      
-#CHECK:     - Length:          
-#CHECK:         TotalLength:     117
-#CHECK:       Version:         4
-#CHECK:       AbbrOffset:      0
-#CHECK:       AddrSize:        8
-#CHECK:       Entries:         
-#CHECK:         - AbbrCode:        0x00000001
-#CHECK:           Values:          
-#CHECK:             - Value:           0x0000000000000001
-#CHECK:             - Value:           0x000000000000000C
-#CHECK:             - Value:           0x0000000000000038
-#CHECK:             - Value:           0x0000000000000000
-#CHECK:             - Value:           0x0000000000000046
-#CHECK:             - Value:           0x0000000100000F50
-#CHECK:             - Value:           0x0000000000000034
-#CHECK:         - AbbrCode:        0x00000002
-#CHECK:           Values:          
-#CHECK:             - Value:           0x0000000100000F50
-#CHECK:             - Value:           0x0000000000000034
-#CHECK:             - Value:           0x0000000000000001
-#CHECK:               BlockData:       [ 0x56 ]
-#CHECK:             - Value:           0x0000000000000076
-#CHECK:             - Value:           0x0000000000000001
-#CHECK:             - Value:           0x0000000000000003
-#CHECK:             - Value:           0x0000000000000001
-#CHECK:             - Value:           0x0000000000000060
-#CHECK:             - Value:           0x0000000000000001
-#CHECK:         - AbbrCode:        0x00000003
-#CHECK:           Values:          
-#CHECK:             - Value:           0x0000000000000002
-#CHECK:               BlockData:       [ 0x91, 0x78 ]
-#CHECK:             - Value:           0x000000000000007B
-#CHECK:             - Value:           0x0000000000000001
-#CHECK:             - Value:           0x0000000000000003
-#CHECK:             - Value:           0x0000000000000060
-#CHECK:         - AbbrCode:        0x00000003
-#CHECK:           Values:          
-#CHECK:             - Value:           0x0000000000000002
-#CHECK:               BlockData:       [ 0x91, 0x70 ]
-#CHECK:             - Value:           0x0000000000000080
-#CHECK:             - Value:           0x0000000000000001
-#CHECK:             - Value:           0x0000000000000003
-#CHECK:             - Value:           0x0000000000000067
-#CHECK:         - AbbrCode:        0x00000000
-#CHECK:           Values:          
-#CHECK:         - AbbrCode:        0x00000004
-#CHECK:           Values:          
-#CHECK:             - Value:           0x0000000000000085
-#CHECK:             - Value:           0x0000000000000005
-#CHECK:             - Value:           0x0000000000000004
-#CHECK:         - AbbrCode:        0x00000005
-#CHECK:           Values:          
-#CHECK:             - Value:           0x000000000000006C
-#CHECK:         - AbbrCode:        0x00000005
-#CHECK:           Values:          
-#CHECK:             - Value:           0x0000000000000071
-#CHECK:         - AbbrCode:        0x00000004
-#CHECK:           Values:          
-#CHECK:             - Value:           0x0000000000000089
-#CHECK:             - Value:           0x0000000000000006
-#CHECK:             - Value:           0x0000000000000001
-#CHECK:         - AbbrCode:        0x00000000
-#CHECK:           Values:          
+#      DWARF32: debug_info:
+# DWARF32-NEXT:   - Length:     117
+# DWARF32-NEXT:     Version:    4
+# DWARF32-NEXT:     AbbrOffset: 0
+# DWARF32-NEXT:     AddrSize:   8
+# DWARF32-NEXT:     Entries:
+# DWARF32-NEXT:       - AbbrCode: 0x00000001
+# DWARF32-NEXT:         Values:
+# DWARF32-NEXT:           - Value: 0x0000000000000001
+# DWARF32-NEXT:           - Value: 0x000000000000000C
+# DWARF32-NEXT:           - Value: 0x0000000000000038
+# DWARF32-NEXT:           - Value: 0x0000000000000000
+# DWARF32-NEXT:           - Value: 0x0000000000000046
+# DWARF32-NEXT:           - Value: 0x0000000100000F50
+# DWARF32-NEXT:           - Value: 0x0000000000000034
+# DWARF32-NEXT:       - AbbrCode: 0x00000002
+# DWARF32-NEXT:         Values:
+# DWARF32-NEXT:           - Value: 0x0000000100000F50
+# DWARF32-NEXT:           - Value: 0x0000000000000034
+# DWARF32-NEXT:           - Value: 0x0000000000000001
+# DWARF32-NEXT:             BlockData: [ 0x56 ]
+# DWARF32-NEXT:           - Value: 0x0000000000000076
+# DWARF32-NEXT:           - Value: 0x0000000000000001
+# DWARF32-NEXT:           - Value: 0x0000000000000003
+# DWARF32-NEXT:           - Value: 0x0000000000000001
+# DWARF32-NEXT:           - Value: 0x0000000000000060
+# DWARF32-NEXT:           - Value: 0x0000000000000001
+# DWARF32-NEXT:       - AbbrCode:        0x00000003
+# DWARF32-NEXT:         Values:
+# DWARF32-NEXT:           - Value: 0x0000000000000002
+# DWARF32-NEXT:             BlockData: [ 0x91, 0x78 ]
+# DWARF32-NEXT:           - Value: 0x000000000000007B
+# DWARF32-NEXT:           - Value: 0x0000000000000001
+# DWARF32-NEXT:           - Value: 0x0000000000000003
+# DWARF32-NEXT:           - Value: 0x0000000000000060
+# DWARF32-NEXT:       - AbbrCode: 0x00000003
+# DWARF32-NEXT:         Values:
+# DWARF32-NEXT:           - Value: 0x0000000000000002
+# DWARF32-NEXT:             BlockData: [ 0x91, 0x70 ]
+# DWARF32-NEXT:           - Value: 0x0000000000000080
+# DWARF32-NEXT:           - Value: 0x0000000000000001
+# DWARF32-NEXT:           - Value: 0x0000000000000003
+# DWARF32-NEXT:           - Value: 0x0000000000000067
+# DWARF32-NEXT:       - AbbrCode: 0x00000000
+# DWARF32-NEXT:         Values:
+# DWARF32-NEXT:       - AbbrCode: 0x00000004
+# DWARF32-NEXT:         Values:
+# DWARF32-NEXT:           - Value: 0x0000000000000085
+# DWARF32-NEXT:           - Value: 0x0000000000000005
+# DWARF32-NEXT:           - Value: 0x0000000000000004
+# DWARF32-NEXT:       - AbbrCode: 0x00000005
+# DWARF32-NEXT:         Values:
+# DWARF32-NEXT:           - Value: 0x000000000000006C
+# DWARF32-NEXT:       - AbbrCode: 0x00000005
+# DWARF32-NEXT:         Values:
+# DWARF32-NEXT:           - Value: 0x0000000000000071
+# DWARF32-NEXT:       - AbbrCode: 0x00000004
+# DWARF32-NEXT:         Values:
+# DWARF32-NEXT:           - Value: 0x0000000000000089
+# DWARF32-NEXT:           - Value: 0x0000000000000006
+# DWARF32-NEXT:           - Value: 0x0000000000000001
+# DWARF32-NEXT:       - AbbrCode: 0x00000000
+# DWARF32-NEXT:         Values:
+
+## b) Test that yaml2obj emits a correct unit header and obj2yaml is able to convert it back.
+
+## Test DWARF32 unit header.
+
+# RUN: yaml2obj --docnum=2 -DFORMAT=DWARF32 %s -o %t2.dwarf32.o
+# RUN: llvm-readobj --hex-dump=__debug_info %t2.dwarf32.o | \
+# RUN:   FileCheck %s --check-prefix=DWARF32-HEADER
+
+#      DWARF32-HEADER: Hex dump of section '__debug_info':
+# DWARF32-HEADER-NEXT: 0x00000000 0c000000 04000000 00000801 34120000 ............4...
+##                                ^-------                            unit_length (4-byte)
+##                                         ^---                       version (2-byte)
+##                                             ^--------              debug_abbrev_offset (4-byte)
+##                                                      ^-            address_size (1-byte)
+
+# RUN: obj2yaml %t2.dwarf32.o | FileCheck %s --check-prefix=DWARF32-YAML
+
+#      DWARF32-YAML: debug_info:
+# DWARF32-YAML-NEXT:   - Length:     12
+# DWARF32-YAML-NEXT:     Version:    4
+# DWARF32-YAML-NEXT:     AbbrOffset: 0
+# DWARF32-YAML-NEXT:     AddrSize:   8
+# DWARF32-YAML-NEXT:     Entries:
+# DWARF32-YAML-NEXT:       - AbbrCode: 0x00000001
+# DWARF32-YAML-NEXT:         Values:
+# DWARF32-YAML-NEXT:           - Value: 0x0000000000001234
+
+--- !mach-o
+FileHeader:
+  magic:      0xFEEDFACF
+  cputype:    0x01000007
+  cpusubtype: 0x00000003
+  filetype:   0x0000000A
+  ncmds:      1
+  sizeofcmds: 232
+  flags:      0x00000000
+  reserved:   0x00000000
+LoadCommands:
+  - cmd:      LC_SEGMENT_64
+    cmdsize:  232
+    segname:  __DWARF
+    vmaddr:   0x00
+    vmsize:   0x00
+    fileoff:  0x00
+    filesize: 0x00
+    maxprot:  0
+    initprot: 0
+    nsects:   2
+    flags:    0
+    Sections:
+      - sectname:  __debug_abbrev
+        segname:   __DWARF
+        addr:      0x00
+        size:      12
+        offset:    528
+        align:     0
+        reloff:    0x00000000
+        nreloc:    0
+        flags:     0x00000000
+        reserved1: 0x00000000
+        reserved2: 0x00000000
+        reserved3: 0x00000000
+      - sectname:  __debug_info
+        segname:   __DWARF
+        addr:      0x00
+        size:      0xffff
+        offset:    1070
+        align:     0
+        reloff:    0x00000000
+        nreloc:    0
+        flags:     0x00000000
+        reserved1: 0x00000000
+        reserved2: 0x00000000
+        reserved3: 0x00000000
+DWARF:
+  debug_abbrev:    
+    - Code:     1
+      Tag:      DW_TAG_compile_unit
+      Children: DW_CHILDREN_no
+      Attributes:
+        - Attribute: DW_AT_producer
+          Form:      DW_FORM_strp
+  debug_info:
+    - Format:     [[FORMAT]]
+      Length:     12
+      Version:    4
+      AbbrOffset: 0
+      AddrSize:   8
+      Entries:
+        - AbbrCode: 1
+          Values:
+            - Value: 0x1234
+
+## Test DWARF64 unit header.
+
+# RUN: yaml2obj --docnum=2 -DFORMAT=DWARF64 %s -o %t2.dwarf64.o
+# RUN: llvm-readobj --hex-dump=__debug_info %t2.dwarf64.o | \
+# RUN:   FileCheck %s --check-prefix=DWARF64-HEADER
+
+#      DWARF64-HEADER: Hex dump of section '__debug_info':
+# DWARF64-HEADER-NEXT: 0x00000000 ffffffff 0c000000 00000000 04000000 ................
+##                                ^-------------------------          unit_length (12-byte)
+##                                                           ^---     version (2-byte)
+##                                                               ^--- debug_abbrev_offset (8-byte)
+# DWARF64-HEADER-NEXT: 0x00000010 00000000 00000801 34120000 00000000 ........4.......
+##                                -------------
+##                                             ^-                     address_size (1-byte)
+
+# RUN: obj2yaml %t2.dwarf64.o | FileCheck %s --check-prefix=DWARF64-YAML
+
+#      DWARF64-YAML: debug_info:
+# DWARF64-YAML-NEXT:   - Format:     DWARF64
+# DWARF64-YAML-NEXT:     Length:     12
+# DWARF64-YAML-NEXT:     Version:    4
+# DWARF64-YAML-NEXT:     AbbrOffset: 0
+# DWARF64-YAML-NEXT:     AddrSize:   8
+# DWARF64-YAML-NEXT:     Entries:
+# DWARF64-YAML-NEXT:       - AbbrCode: 0x00000001
+# DWARF64-YAML-NEXT:         Values:
+# DWARF64-YAML-NEXT:           - Value: 0x0000000000001234

llvm/test/ObjectYAML/MachO/DWARF-debug_line.yaml

debug_pubtypes:
     UnitOffset:      0
     UnitSize:        121
     Entries:         
       - DieOffset:       0x00000060
         Name:            int
       - DieOffset:       0x00000071
         Name:            char
   debug_info:      
-    - Length:          
-        TotalLength:     117
+    - Length:          117
       Version:         4
       AbbrOffset:      0
       AddrSize:        8
       Entries:         
         - AbbrCode:        0x00000001
           Values:          
             - Value:           0x0000000000000001
             - Value:           0x000000000000000C

llvm/test/ObjectYAML/MachO/DWARF-debug_ranges.yaml

- Offset:          0x00000000
           HighOffset:      0x0000000000000020
         - LowOffset:       0x0000000000000000
           HighOffset:      0x0000000000000030
         - LowOffset:       0xFFFFFFFFFFFFFFFF
           HighOffset:      0x0000000000001000
         - LowOffset:       0x0000000000000000
           HighOffset:      0x0000000000001000
   debug_info:
-    - Length:
-        TotalLength:     82
+    - Length:          82
       Version:         4
       AbbrOffset:      0
       AddrSize:        8
       Entries:
         - AbbrCode:        0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000000004

llvm/test/ObjectYAML/MachO/DWARF2-AddrSize8-FormValues.yaml

- Code:            0x00000001
           Form:            DW_FORM_udata
         - Attribute:       0x2018
           Form:            DW_FORM_GNU_ref_alt
         - Attribute:       0x2019
           Form:            DW_FORM_sec_offset
         - Attribute:       0x201A
           Form:            DW_FORM_addr
   debug_info:      
-    - Length:          
-        TotalLength:     168
+    - Length:          168
       Version:         2
       AbbrOffset:      0
       AddrSize:        8
       Entries:         
         - AbbrCode:        0x00000001
           Values:          
             - Value:           0x0123456789ABCDEF
             - Value:           0x000000000000000A
- Length:          168
             - Value:           0x8000000000000000
             - Value:           0xFFFFFFFFFFFFFFFE
             - Value:           0x0000000000000001
             - Value:           0x0000000000000002
             - Value:           0x0123456789ABCDEF
 ...
 
 #CHECK:   debug_info:      
-#CHECK:     - Length:          
-#CHECK:         TotalLength:     168
+#CHECK:     - Length:          168
 #CHECK:       Version:         2
 #CHECK:       AbbrOffset:      0
 #CHECK:       AddrSize:        8
 #CHECK:       Entries:         
 #CHECK:         - AbbrCode:        0x00000001
 #CHECK:           Values:          
 #CHECK:             - Value:           0x0123456789ABCDEF
 #CHECK:             - Value:           0x000000000000000A

llvm/test/ObjectYAML/MachO/DWARF5-debug_info.yaml

-# RUN: yaml2obj %s | obj2yaml | FileCheck %s
+## This file contains test cases for generating .debug_info
+## section in object files from the DWARF entry of Mach-O YAML inputs.
+
+## a) Test that yaml2obj emits a DWARF32 .debug_info sections and obj2yaml
+## converts it back.
+
+# RUN: yaml2obj --docnum=1 %s | obj2yaml | FileCheck %s --check-prefix=DWARF32
 
 --- !mach-o
 FileHeader:      
   magic:           0xFEEDFACF
   cputype:         0x01000007
   cpusubtype:      0x00000003
   filetype:        0x0000000A
   ncmds:           5
- Length:          44
       Version:         2
       CuOffset:        0
       AddrSize:        8
       SegSize:         0
       Descriptors:     
         - Address:         0x0000000100000F50
           Length:          52
   debug_info:      
-    - Length:          
-        TotalLength:     118
+    - Length:          118
       Version:         5
       UnitType:        DW_UT_compile
       AbbrOffset:      0
       AddrSize:        8
       Entries:         
         - AbbrCode:        0x00000001
           Values:          
             - Value:           0x0000000000000001
- Length:          65
           Data:            11
         - Opcode:          DW_LNS_extended_op
           ExtLen:          1
           SubOpcode:       DW_LNE_end_sequence
           Data:            11
 ...
 
 
-#CHECK: DWARF:           
-#CHECK:   debug_info:      
-#CHECK:     - Length:          
-#CHECK:         TotalLength:     118
-#CHECK:       Version:         5
-#CHECK:       UnitType:        DW_UT_compile
-#CHECK:       AbbrOffset:      0
-#CHECK:       AddrSize:        8
-#CHECK:       Entries:         
-#CHECK:         - AbbrCode:        0x00000001
-#CHECK:           Values:          
-#CHECK:             - Value:           0x0000000000000001
-#CHECK:             - Value:           0x000000000000000C
-#CHECK:             - Value:           0x0000000000000038
-#CHECK:             - Value:           0x0000000000000000
-#CHECK:             - Value:           0x0000000000000046
-#CHECK:             - Value:           0x0000000100000F50
-#CHECK:             - Value:           0x0000000000000034
-#CHECK:         - AbbrCode:        0x00000002
-#CHECK:           Values:          
-#CHECK:             - Value:           0x0000000100000F50
-#CHECK:             - Value:           0x0000000000000034
-#CHECK:             - Value:           0x0000000000000001
-#CHECK:               BlockData:       [ 0x56 ]
-#CHECK:             - Value:           0x0000000000000076
-#CHECK:             - Value:           0x0000000000000001
-#CHECK:             - Value:           0x0000000000000003
-#CHECK:             - Value:           0x0000000000000001
-#CHECK:             - Value:           0x0000000000000060
-#CHECK:             - Value:           0x0000000000000001
-#CHECK:         - AbbrCode:        0x00000003
-#CHECK:           Values:          
-#CHECK:             - Value:           0x0000000000000002
-#CHECK:               BlockData:       [ 0x91, 0x78 ]
-#CHECK:             - Value:           0x000000000000007B
-#CHECK:             - Value:           0x0000000000000001
-#CHECK:             - Value:           0x0000000000000003
-#CHECK:             - Value:           0x0000000000000060
-#CHECK:         - AbbrCode:        0x00000003
-#CHECK:           Values:          
-#CHECK:             - Value:           0x0000000000000002
-#CHECK:               BlockData:       [ 0x91, 0x70 ]
-#CHECK:             - Value:           0x0000000000000080
-#CHECK:             - Value:           0x0000000000000001
-#CHECK:             - Value:           0x0000000000000003
-#CHECK:             - Value:           0x0000000000000067
-#CHECK:         - AbbrCode:        0x00000000
-#CHECK:           Values:          
-#CHECK:         - AbbrCode:        0x00000004
-#CHECK:           Values:          
-#CHECK:             - Value:           0x0000000000000085
-#CHECK:             - Value:           0x0000000000000005
-#CHECK:             - Value:           0x0000000000000004
-#CHECK:         - AbbrCode:        0x00000005
-#CHECK:           Values:          
-#CHECK:             - Value:           0x000000000000006C
-#CHECK:         - AbbrCode:        0x00000005
-#CHECK:           Values:          
-#CHECK:             - Value:           0x0000000000000071
-#CHECK:         - AbbrCode:        0x00000004
-#CHECK:           Values:          
-#CHECK:             - Value:           0x0000000000000089
-#CHECK:             - Value:           0x0000000000000006
-#CHECK:             - Value:           0x0000000000000001
-#CHECK:         - AbbrCode:        0x00000000
-#CHECK:           Values:          
+#      DWARF32: debug_info:
+# DWARF32-NEXT:   - Length:     118
+# DWARF32-NEXT:     Version:    5
+# DWARF32-NEXT:     UnitType:   DW_UT_compile
+# DWARF32-NEXT:     AbbrOffset: 0
+# DWARF32-NEXT:     AddrSize:   8
+# DWARF32-NEXT:     Entries:
+# DWARF32-NEXT:       - AbbrCode: 0x00000001
+# DWARF32-NEXT:         Values:
+# DWARF32-NEXT:           - Value: 0x0000000000000001
+# DWARF32-NEXT:           - Value: 0x000000000000000C
+# DWARF32-NEXT:           - Value: 0x0000000000000038
+# DWARF32-NEXT:           - Value: 0x0000000000000000
+# DWARF32-NEXT:           - Value: 0x0000000000000046
+# DWARF32-NEXT:           - Value: 0x0000000100000F50
+# DWARF32-NEXT:           - Value: 0x0000000000000034
+# DWARF32-NEXT:       - AbbrCode: 0x00000002
+# DWARF32-NEXT:         Values:
+# DWARF32-NEXT:           - Value: 0x0000000100000F50
+# DWARF32-NEXT:           - Value: 0x0000000000000034
+# DWARF32-NEXT:           - Value: 0x0000000000000001
+# DWARF32-NEXT:             BlockData: [ 0x56 ]
+# DWARF32-NEXT:           - Value: 0x0000000000000076
+# DWARF32-NEXT:           - Value: 0x0000000000000001
+# DWARF32-NEXT:           - Value: 0x0000000000000003
+# DWARF32-NEXT:           - Value: 0x0000000000000001
+# DWARF32-NEXT:           - Value: 0x0000000000000060
+# DWARF32-NEXT:           - Value: 0x0000000000000001
+# DWARF32-NEXT:       - AbbrCode: 0x00000003
+# DWARF32-NEXT:         Values:
+# DWARF32-NEXT:           - Value: 0x0000000000000002
+# DWARF32-NEXT:             BlockData: [ 0x91, 0x78 ]
+# DWARF32-NEXT:           - Value: 0x000000000000007B
+# DWARF32-NEXT:           - Value: 0x0000000000000001
+# DWARF32-NEXT:           - Value: 0x0000000000000003
+# DWARF32-NEXT:           - Value: 0x0000000000000060
+# DWARF32-NEXT:       - AbbrCode:        0x00000003
+# DWARF32-NEXT:         Values:          
+# DWARF32-NEXT:           - Value:           0x0000000000000002
+# DWARF32-NEXT:             BlockData:       [ 0x91, 0x70 ]
+# DWARF32-NEXT:           - Value:           0x0000000000000080
+# DWARF32-NEXT:           - Value:           0x0000000000000001
+# DWARF32-NEXT:           - Value:           0x0000000000000003
+# DWARF32-NEXT:           - Value:           0x0000000000000067
+# DWARF32-NEXT:       - AbbrCode:        0x00000000
+# DWARF32-NEXT:         Values:          
+# DWARF32-NEXT:       - AbbrCode:        0x00000004
+# DWARF32-NEXT:         Values:          
+# DWARF32-NEXT:           - Value:           0x0000000000000085
+# DWARF32-NEXT:           - Value:           0x0000000000000005
+# DWARF32-NEXT:           - Value:           0x0000000000000004
+# DWARF32-NEXT:       - AbbrCode:        0x00000005
+# DWARF32-NEXT:         Values:          
+# DWARF32-NEXT:           - Value:           0x000000000000006C
+# DWARF32-NEXT:       - AbbrCode:        0x00000005
+# DWARF32-NEXT:         Values:          
+# DWARF32-NEXT:           - Value:           0x0000000000000071
+# DWARF32-NEXT:       - AbbrCode:        0x00000004
+# DWARF32-NEXT:         Values:          
+# DWARF32-NEXT:           - Value:           0x0000000000000089
+# DWARF32-NEXT:           - Value:           0x0000000000000006
+# DWARF32-NEXT:           - Value:           0x0000000000000001
+# DWARF32-NEXT:       - AbbrCode:        0x00000000
+# DWARF32-NEXT:         Values:          
+
+## b) Test that yaml2obj emits a correct unit header and obj2yaml is able to convert it back.
+
+## Test DWARF32 unit header.
+
+# RUN: yaml2obj --docnum=2 -DFORMAT=DWARF32 %s -o %t2.dwarf32.o
+# RUN: llvm-readobj --hex-dump=__debug_info %t2.dwarf32.o | \
+# RUN:   FileCheck %s --check-prefix=DWARF32-HEADER
+
+#      DWARF32-HEADER: Hex dump of section '__debug_info':
+# DWARF32-HEADER-NEXT: 0x00000000 0c000000 05000108 00000000 01341200 .............4..
+##                                ^-------                            unit_header (4-byte)
+##                                         ^---                       version (2-byte)
+##                                             ^-                     unit_type (1-byte)
+##                                               ^-                   address_size (1-byte)
+##                                                  ^-------          deubug_abbrev_offset (4-byte)
+# DWARF32-HEADER-NEXT: 0x00000010 00                                  .
+
+# RUN: obj2yaml %t2.dwarf32.o | FileCheck %s --check-prefix=DWARF32-YAML
+
+#      DWARF32-YAML: debug_info:
+# DWARF32-YAML-NEXT:   - Length:     12
+# DWARF32-YAML-NEXT:     Version:    5
+# DWARF32-YAML-NEXT:     UnitType:   DW_UT_compile
+# DWARF32-YAML-NEXT:     AbbrOffset: 0x0000000000000000
+# DWARF32-YAML-NEXT:     AddrSize:   8
+# DWARF32-YAML-NEXT:     Entries:
+# DWARF32-YAML-NEXT:       - AbbrCode: 0x00000001
+# DWARF32-YAML-NEXT:         Values:
+# DWARF32-YAML-NEXT:           - Value: 0x0000000000001234
+
+--- !mach-o
+FileHeader:
+  magic:      0xFEEDFACF
+  cputype:    0x01000007
+  cpusubtype: 0x00000003
+  filetype:   0x0000000A
+  ncmds:      1
+  sizeofcmds: 232
+  flags:      0x00000000
+  reserved:   0x00000000
+LoadCommands:
+  - cmd:      LC_SEGMENT_64
+    cmdsize:  232
+    segname:  __DWARF
+    vmaddr:   0x00
+    vmsize:   0x00
+    fileoff:  0x00
+    filesize: 0x00
+    maxprot:  0
+    initprot: 0
+    nsects:   2
+    flags:    0
+    Sections:
+      - sectname:  __debug_abbrev
+        segname:   __DWARF
+        addr:      0x00
+        size:      12
+        offset:    528
+        align:     0
+        reloff:    0x00000000
+        nreloc:    0
+        flags:     0x00000000
+        reserved1: 0x00000000
+        reserved2: 0x00000000
+        reserved3: 0x00000000
+      - sectname:  __debug_info
+        segname:   __DWARF
+        addr:      0x00
+        size:      0xffff
+        offset:    1070
+        align:     0
+        reloff:    0x00000000
+        nreloc:    0
+        flags:     0x00000000
+        reserved1: 0x00000000
+        reserved2: 0x00000000
+        reserved3: 0x00000000
+DWARF:
+  debug_abbrev:    
+    - Code:     1
+      Tag:      DW_TAG_compile_unit
+      Children: DW_CHILDREN_no
+      Attributes:
+        - Attribute: DW_AT_producer
+          Form:      DW_FORM_strp
+  debug_info:
+    - Format:     [[FORMAT]]
+      Length:     12
+      Version:    5
+      UnitType:   DW_UT_compile
+      AbbrOffset: 0
+      AddrSize:   8
+      Entries:
+        - AbbrCode: 1
+          Values:
+            - Value: 0x1234
+
+## Test DWARF64 unit header.
+
+# RUN: yaml2obj --docnum=2 -DFORMAT=DWARF64 %s -o %t2.dwarf64.o
+# RUN: llvm-readobj --hex-dump=__debug_info %t2.dwarf64.o | \
+# RUN:   FileCheck %s --check-prefix=DWARF64-HEADER
+
+#      DWARF64-HEADER: Hex dump of section '__debug_info':
+# DWARF64-HEADER-NEXT: 0x00000000 ffffffff 0c000000 00000000 05000108 ................
+##                                ^-------------------------          unit_length (12-byte)
+##                                                           ^---     version (2-byte)
+##                                                               ^-   unit_type (1-byte)
+##                                                                 ^- address_size (1-byte)
+# DWARF64-HEADER-NEXT: 0x00000010 00000000 00000000 01341200 00000000 .........4......
+##                                ^----------------                   debug_abbrev_offset (8-byte)
+# DWARF64-HEADER-NEXT: 0x00000020 00                                  .
+
+# RUN: obj2yaml %t2.dwarf64.o | FileCheck %s --check-prefix=DWARF64-YAML
+
+#      DWARF64-YAML: debug_info:
+# DWARF64-YAML-NEXT:   - Format:     DWARF64
+# DWARF64-YAML-NEXT:     Length:     12
+# DWARF64-YAML-NEXT:     Version:    5
+# DWARF64-YAML-NEXT:     UnitType:   DW_UT_compile
+# DWARF64-YAML-NEXT:     AbbrOffset: 0x0000000000000000
+# DWARF64-YAML-NEXT:     AddrSize:   8

llvm/test/tools/llvm-dwarfdump/X86/verify_overlapping_cu_ranges.yaml

- Offset:          0x00000000
           HighOffset:      0x0000000000003000
         - LowOffset:       0x0000000000000000
           HighOffset:      0x0000000000000020
         - LowOffset:       0x0000000000000000
           HighOffset:      0x0000000000000030
         - LowOffset:       0x0000000000001000
           HighOffset:      0x0000000000002000
   debug_info:
-    - Length:
-        TotalLength:     99
+    - Length:          99
       Version:         4
       AbbrOffset:      0
       AddrSize:        8
       Entries:
         - AbbrCode:        0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000000002

llvm/test/tools/llvm-gsymutil/ARM_AArch64/fat-macho-dwarf.yaml

DWARF:
         UnitOffset:      0
         UnitSize:        119
         Entries:
           - DieOffset:       0x00000059
             Name:            int
           - DieOffset:       0x0000006F
             Name:            char
       debug_info:
-        - Length:
-            TotalLength:     115
+        - Length:          115
           Version:         4
           AbbrOffset:      0
           AddrSize:        4
           Entries:
             - AbbrCode:        0x00000001
               Values:
                 - Value:           0x0000000000000001
                 - Value:           0x0000000000000004
DWARF:
         UnitOffset:      0
         UnitSize:        126
         Entries:
           - DieOffset:       0x00000060
             Name:            int
           - DieOffset:       0x00000076
             Name:            char
       debug_info:
-        - Length:
-            TotalLength:     122
+        - Length:          122
           Version:         4
           AbbrOffset:      0
           AddrSize:        8
           Entries:
             - AbbrCode:        0x00000001
               Values:
                 - Value:           0x0000000000000001
                 - Value:           0x0000000000000004

llvm/test/tools/llvm-gsymutil/X86/mach-dwarf.yaml

debug_pubtypes:
     UnitOffset:      0
     UnitSize:        224
     Entries:
       - DieOffset:       0x00000062
         Name:            int
       - DieOffset:       0x000000D8
         Name:            char
   debug_info:
-    - Length:
-        TotalLength:     220
+    - Length:          220
       Version:         4
       AbbrOffset:      0
       AddrSize:        8
       Entries:
         - AbbrCode:        0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000000004

llvm/test/tools/llvm-objcopy/MachO/Inputs/strip-all-with-dwarf.yaml

- Code:            0x00000005
           Form:            DW_FORM_data1
         - Attribute:       DW_AT_decl_line
           Form:            DW_FORM_data1
         - Attribute:       DW_AT_type
           Form:            DW_FORM_ref4
         - Attribute:       DW_AT_external
           Form:            DW_FORM_flag_present
   debug_info:
-    - Length:
-        TotalLength:     113
+    - Length:          113
       Version:         4
       AbbrOffset:      0
       AddrSize:        8
       Entries:
         - AbbrCode:        0x00000001
           Values:
             - Value:           0x0000000000000000
             - Value:           0x000000000000000C

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

- Code:     1
           Form:      DW_FORM_addrx1         ## 0x29
         - Attribute: 0x01
           Form:      DW_FORM_addrx2         ## 0x2a
         - Attribute: 0x01
           Form:      DW_FORM_addrx3         ## 0x2b
         - Attribute: 0x01
           Form:      DW_FORM_addrx4         ## 0x2c
   debug_info:
-    - Length:
-        TotalLength: 0x1234
+    - Length:     0x1234
       Version:    5
       UnitType:   DW_UT_type
       AbbrOffset: 0x1234
       AddrSize:   4
       Entries:
         - AbbrCode: 1
           Values:
             - Value: 0x12345678         ## DW_FORM_addr
- Length:     0x1234
             - Value: 0x12               ## DW_FORM_strx1
             - Value: 0x1234             ## DW_FORM_strx2
             - Value: 0x123456           ## DW_FORM_strx3 (unimplemented)
             - Value: 0x12345678         ## DW_FORM_strx4
             - Value: 0x12               ## DW_FORM_addrx1
             - Value: 0x1234             ## DW_FORM_addrx2
             - Value: 0x123456           ## DW_FORM_addrx3 (unimplemented)
             - Value: 0x12345678         ## DW_FORM_addrx4
-    - Length:
-        TotalLength: 0x1234
+    - Length:     0x1234
       Version:    5
       ## Test another unit type.
       UnitType:   DW_UT_compile
       AbbrOffset: 0x1234
       AddrSize:   4
       Entries:
         - AbbrCode: 0
           Values:   []
-    - Length:
-        TotalLength: 0x5678
+    - Length:     0x5678
       ## Test DWARFv4
       Version:    4
       AbbrOffset: 0x5678
       AddrSize:   4
       Entries:
         - AbbrCode: 1
           Values:
             - Value: 0x12345678 ## DW_FORM_addr
- Name: .debug_info
     Size: 0x10
 DWARF:
   debug_abbrev:
     - Code:       1
       Tag:        DW_TAG_compile_unit
       Children:   DW_CHILDREN_no
       Attributes: []
   debug_info:
-    - Length:
-        TotalLength: 0x1234
+    - Length:     0x1234
       Version:    5
       UnitType:   DW_UT_type
       AbbrOffset: 0x1234
       AddrSize:   4
       Entries:    []
 
 ## e) Test that yaml2obj emits an error message when both the "Content" and the
 ## "debug_info" entry are specified at the same time.
- Name: .debug_info
     Content: "00"
 DWARF:
   debug_abbrev:
     - Code:       1
       Tag:        DW_TAG_compile_unit
       Children:   DW_CHILDREN_no
       Attributes: []
   debug_info:
-    - Length:
-        TotalLength: 0x1234
+    - Length:     0x1234
       Version:    5
       UnitType:   DW_UT_type
       AbbrOffset: 0x1234
       AddrSize:   4
       Entries:    []
 
 ## f) Test that all the properties can be overridden by the section header when
 ## the "debug_info" entry doesn't exist.
- Name:         .sec        ## Linked by .debug_info.
     Type:         SHT_STRTAB
 DWARF:
   debug_abbrev:
     - Code:       1
       Tag:        DW_TAG_compile_unit
       Children:   DW_CHILDREN_no
       Attributes: []
   debug_info:
-    - Length:
-        TotalLength: 0x1234
+    - Length:     0x1234
       Version:    5
       UnitType:   DW_UT_type
       AbbrOffset: 0x1234
       AddrSize:   4
       Entries:
         - AbbrCode: 0
           Values:   []
 

 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64
 DWARF:
   debug_info:
-    - Length:
-        TotalLength: 0x1234
+    - Length:     0x1234
       Version:    5
       UnitType:   DW_UT_type
       AbbrOffset: 0x1234
       AddrSize:   4
       Entries:    []
 
 ## h) Test that yaml2obj emits values in the DIE according to the abbreviation whose
 ## index is equal to the value in 'AbbrevCode'.
debug_abbrev:
     - Tag:        DW_TAG_subprogram
       Children:   DW_CHILDREN_no
       Attributes:
         - Attribute: DW_AT_low_pc
           Form:      DW_FORM_data2
         - Attribute: DW_AT_high_pc
           Form:      DW_FORM_data4
   debug_info:
-    - Length:
-        TotalLength: 0x1234
+    - Length:     0x1234
       Version:    5
       UnitType:   DW_UT_type
       AbbrOffset: 0x1234
       AddrSize:   4
       Entries:
         ## Test that yaml2obj emits values when the abbrev code is specified.
         - AbbrCode: 2
           Values:

 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64
 DWARF:
   debug_info:
-    - Length:
-        TotalLength: 0x1234
+    - Length:     0x1234
       Version:    5
       UnitType:   DW_UT_type
       AbbrOffset: 0x1234
       AddrSize:   4
       Entries:
         - AbbrCode: 1
           Values:
             - Value: 0x1234

 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64
 DWARF:
   debug_info:
-    - Length:
-        TotalLength:   0xffffffff
-        TotalLength64: 0x0c
+    - Format:     DWARF64
+      Length:     0x0c
       Version:    5
       UnitType:   DW_UT_type
       AbbrOffset: 0x1234
       AddrSize:   8
       Entries:    []
 
 ## DWARFv4 unit header.
 

 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64
 DWARF:
   debug_info:
-    - Length:
-        TotalLength:   0xffffffff
-        TotalLength64: 0x0c
+    - Format:     DWARF64
+      Length:     0x0c
       Version:    4
       AbbrOffset: 0x1234
       AddrSize:   8
       Entries:    []

llvm/tools/obj2yaml/dwarf2yaml.cpp

void dumpDebugPubSections(DWARFContext &DCtx, DWARFYAML::Data &Y) {
   if (!GNUPubTypes.Data.empty())
     // TODO: Test dumping .debug_gnu_pubtypes section.
     Y.GNUPubTypes = dumpPubSection(DCtx, GNUPubTypes, /*IsGNUStyle=*/true);
 }
 
 void dumpDebugInfo(DWARFContext &DCtx, DWARFYAML::Data &Y) {
   for (const auto &CU : DCtx.compile_units()) {
     DWARFYAML::Unit NewUnit;
-    NewUnit.Length.setLength(CU->getLength());
+    NewUnit.Format = CU->getFormat();
+    NewUnit.Length = CU->getLength();
     NewUnit.Version = CU->getVersion();
     if(NewUnit.Version >= 5)
       NewUnit.Type = (dwarf::UnitType)CU->getUnitType();
     NewUnit.AbbrOffset = CU->getAbbreviations()->getOffset();
     NewUnit.AddrSize = CU->getAddressByteSize();
     for (auto DIE : CU->dies()) {
       DWARFYAML::Entry NewEntry;
       DataExtractor EntryData = CU->getDebugInfoExtractor();

llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp

 
 TEST(DWARFDebugInfo, TestEmptyChildren) {
   const char *yamldata = "debug_abbrev:\n"
                          "  - Code:            0x00000001\n"
                          "    Tag:             DW_TAG_compile_unit\n"
                          "    Children:        DW_CHILDREN_yes\n"
                          "    Attributes:\n"
                          "debug_info:\n"
-                         "  - Length:\n"
-                         "      TotalLength:          0\n"
+                         "  - Length:          0\n"
                          "    Version:         4\n"
                          "    AbbrOffset:      0\n"
                          "    AddrSize:        8\n"
                          "    Entries:\n"
                          "      - AbbrCode:        0x00000001\n"
                          "        Values:\n"
                          "      - AbbrCode:        0x00000000\n"
                          "        Values:\n";
debug_abbrev:
         Tag:             DW_TAG_subprogram
         Children:        DW_CHILDREN_no
         Attributes:
           - Attribute:       DW_AT_name
             Form:            DW_FORM_strp
           - Attribute:       DW_AT_type
             Form:            DW_FORM_ref4
     debug_info:
-      - Length:
-          TotalLength:     22
+      - Length:          22
         Version:         4
         AbbrOffset:      0
         AddrSize:        8
         Entries:
           - AbbrCode:        0x00000001
             Values:
               - Value:           0x0000000000000001
           - AbbrCode:        0x00000002
debug_abbrev:
         Tag:             DW_TAG_subprogram
         Children:        DW_CHILDREN_no
         Attributes:
           - Attribute:       DW_AT_name
             Form:            DW_FORM_strp
           - Attribute:       DW_AT_type
             Form:            DW_FORM_ref_addr
     debug_info:
-      - Length:
-          TotalLength:     22
+      - Length:          22
         Version:         4
         AbbrOffset:      0
         AddrSize:        8
         Entries:
           - AbbrCode:        0x00000001
             Values:
               - Value:           0x0000000000000001
           - AbbrCode:        0x00000002
debug_abbrev:
         Tag:             DW_TAG_compile_unit
         Children:        DW_CHILDREN_no
         Attributes:
           - Attribute:       DW_AT_name
             Form:            DW_FORM_strp
           - Attribute:       DW_AT_ranges
             Form:            DW_FORM_sec_offset
     debug_info:
-      - Length:
-          TotalLength:     16
+      - Length:          16
         Version:         4
         AbbrOffset:      0
         AddrSize:        8
         Entries:
           - AbbrCode:        0x00000001
             Values:
               - Value:           0x0000000000000001
               - Value:           0x0000000000001000
debug_abbrev:
         Tag:             DW_TAG_compile_unit
         Children:        DW_CHILDREN_no
         Attributes:
           - Attribute:       DW_AT_name
             Form:            DW_FORM_strp
           - Attribute:       DW_AT_ranges
             Form:            DW_FORM_sec_offset
     debug_info:
-      - Length:
-          TotalLength:     17
+      - Length:          17
         Version:         5
         UnitType:        DW_UT_compile
         AbbrOffset:      0
         AddrSize:        8
         Entries:
           - AbbrCode:        0x00000001
             Values:
               - Value:           0x0000000000000001
debug_abbrev:
         Tag:             DW_TAG_compile_unit
         Children:        DW_CHILDREN_no
         Attributes:
           - Attribute:       DW_AT_name
             Form:            DW_FORM_strp
           - Attribute:       DW_AT_stmt_list
             Form:            DW_FORM_sec_offset
     debug_info:
-      - Length:
-          TotalLength:     16
+      - Length:          16
         Version:         4
         AbbrOffset:      0
         AddrSize:        8
         Entries:
           - AbbrCode:        0x00000001
             Values:
               - Value:           0x0000000000000001
               - Value:           0x0000000000001000
const char *yamldata = R"(
     debug_abbrev:
       - Code:            0x00000001
         Tag:             DW_TAG_compile_unit
         Children:        DW_CHILDREN_no
         Attributes:
           - Attribute:       DW_AT_name
             Form:            DW_FORM_strp
     debug_info:
-      - Length:
-          TotalLength:     12
+      - Length:          12
         Version:         4
         AbbrOffset:      0
         AddrSize:        8
         Entries:
           - AbbrCode:        0x00000001
             Values:
               - Value:           0x0000000000001234
   )";
debug_abbrev:
         Tag:             DW_TAG_subprogram
         Children:        DW_CHILDREN_no
         Attributes:
           - Attribute:       DW_AT_name
             Form:            DW_FORM_strp
           - Attribute:       DW_AT_type
             Form:            DW_FORM_ref_addr
     debug_info:
-      - Length:
-          TotalLength:     22
+      - Length:          22
         Version:         4
         AbbrOffset:      0
         AddrSize:        8
         Entries:
           - AbbrCode:        0x00000001
             Values:
               - Value:           0x0000000000000001
           - AbbrCode:        0x00000002
debug_abbrev:
         Tag:             DW_TAG_compile_unit
         Children:        DW_CHILDREN_no
         Attributes:
           - Attribute:       DW_AT_name
             Form:            DW_FORM_strp
           - Attribute:       DW_AT_stmt_list
             Form:            DW_FORM_sec_offset
     debug_info:
-      - Length:
-          TotalLength:     16
+      - Length:          16
         Version:         4
         AbbrOffset:      0
         AddrSize:        8
         Entries:
           - AbbrCode:        0x00000001
             Values:
               - Value:           0x0000000000000001
               - Value:           0x0000000000000000
debug_abbrev:
         Tag:             DW_TAG_compile_unit
         Children:        DW_CHILDREN_no
         Attributes:
           - Attribute:       DW_AT_name
             Form:            DW_FORM_strp
           - Attribute:       DW_AT_stmt_list
             Form:            DW_FORM_sec_offset
     debug_info:
-      - Length:
-          TotalLength:     16
+      - Length:          16
         Version:         4
         AbbrOffset:      0
         AddrSize:        8
         Entries:
           - AbbrCode:        0x00000001
             Values:
               - Value:           0x0000000000000001
               - Value:           0x0000000000000000
debug_abbrev:
         Tag:             DW_TAG_compile_unit
         Children:        DW_CHILDREN_no
         Attributes:
           - Attribute:       DW_AT_name
             Form:            DW_FORM_strp
           - Attribute:       DW_AT_stmt_list
             Form:            DW_FORM_sec_offset
     debug_info:
-      - Length:
-          TotalLength:     16
+      - Length:          16
         Version:         4
         AbbrOffset:      0
         AddrSize:        8
         Entries:
           - AbbrCode:        0x00000001
             Values:
               - Value:           0x0000000000000001
               - Value:           0x0000000000000000
debug_abbrev:
         Tag:             DW_TAG_compile_unit
         Children:        DW_CHILDREN_no
         Attributes:
           - Attribute:       DW_AT_name
             Form:            DW_FORM_strp
           - Attribute:       DW_AT_stmt_list
             Form:            DW_FORM_sec_offset
     debug_info:
-      - Length:
-          TotalLength:     16
+      - Length:          16
         Version:         4
         AbbrOffset:      0
         AddrSize:        8
         Entries:
           - AbbrCode:        0x00000001
             Values:
               - Value:           0x0000000000000001
               - Value:           0x0000000000000000
debug_abbrev:
         Tag:             DW_TAG_compile_unit
         Children:        DW_CHILDREN_no
         Attributes:
           - Attribute:       DW_AT_name
             Form:            DW_FORM_strp
           - Attribute:       DW_AT_stmt_list
             Form:            DW_FORM_sec_offset
     debug_info:
-      - Length:
-          TotalLength:     16
+      - Length:          16
         Version:         4
         AbbrOffset:      0
         AddrSize:        8
         Entries:
           - AbbrCode:        0x00000001
             Values:
               - Value:           0x0000000000000001
               - Value:           0x0000000000000000
-      - Length:
-          TotalLength:     16
+      - Length:          16
         Version:         4
         AbbrOffset:      0
         AddrSize:        8
         Entries:
           - AbbrCode:        0x00000001
             Values:
               - Value:           0x000000000000000D
               - Value:           0x0000000000000000
debug_abbrev:
         Tag:             DW_TAG_subprogram
         Children:        DW_CHILDREN_no
         Attributes:
           - Attribute:       DW_AT_low_pc
             Form:            DW_FORM_addr
           - Attribute:       DW_AT_high_pc
             Form:            DW_FORM_addr
     debug_info:
-      - Length:
-          TotalLength:     46
+      - Length:          46
         Version:         4
         AbbrOffset:      0
         AddrSize:        8
         Entries:
           - AbbrCode:        0x00000001
             Values:
               - Value:           0x0000000000001000
               - Value:           0x0000000000001500
debug_abbrev:
         Tag:             DW_TAG_lexical_block
         Children:        DW_CHILDREN_no
         Attributes:
           - Attribute:       DW_AT_low_pc
             Form:            DW_FORM_addr
           - Attribute:       DW_AT_high_pc
             Form:            DW_FORM_addr
     debug_info:
-      - Length:
-          TotalLength:     52
+      - Length:          52
         Version:         4
         AbbrOffset:      0
         AddrSize:        8
         Entries:
           - AbbrCode:        0x00000001
             Values:
               - Value:           0x0000000000000001
           - AbbrCode:        0x00000002
debug_abbrev:
         Attributes:
           - Attribute:       DW_AT_name
             Form:            DW_FORM_strp
           - Attribute:       DW_AT_low_pc
             Form:            DW_FORM_addr
           - Attribute:       DW_AT_high_pc
             Form:            DW_FORM_addr
     debug_info:
-      - Length:
-          TotalLength:     55
+      - Length:          55
         Version:         4
         AbbrOffset:      0
         AddrSize:        8
         Entries:
           - AbbrCode:        0x00000001
             Values:
               - Value:           0x0000000000000001
           - AbbrCode:        0x00000002
debug_abbrev:
         Tag:             DW_TAG_lexical_block
         Children:        DW_CHILDREN_no
         Attributes:
           - Attribute:       DW_AT_low_pc
             Form:            DW_FORM_addr
           - Attribute:       DW_AT_high_pc
             Form:            DW_FORM_addr
     debug_info:
-      - Length:
-          TotalLength:     85
+      - Length:          85
         Version:         4
         AbbrOffset:      0
         AddrSize:        8
         Entries:
           - AbbrCode:        0x00000001
             Values:
               - Value:           0x0000000000001000
               - Value:           0x0000000000002000
debug_abbrev:
         Attributes:
           - Attribute:       DW_AT_name
             Form:            DW_FORM_strp
           - Attribute:       DW_AT_low_pc
             Form:            DW_FORM_addr
           - Attribute:       DW_AT_high_pc
             Form:            DW_FORM_addr
     debug_info:
-      - Length:
-          TotalLength:     34
+      - Length:          34
         Version:         4
         AbbrOffset:      0
         AddrSize:        8
         Entries:
           - AbbrCode:        0x00000001
             Values:
               - Value:           0x0000000000000001
           - AbbrCode:        0x00000002
debug_abbrev:
         Attributes:
           - Attribute:       DW_AT_name
             Form:            DW_FORM_strp
           - Attribute:       DW_AT_low_pc
             Form:            DW_FORM_addr
           - Attribute:       DW_AT_high_pc
             Form:            DW_FORM_addr
     debug_info:
-      - Length:
-          TotalLength:     71
+      - Length:          71
         Version:         4
         AbbrOffset:      0
         AddrSize:        8
         Entries:
           - AbbrCode:        0x00000001
             Values:
               - Value:           0x0000000000001000
               - Value:           0x0000000000002000
debug_abbrev:
         Attributes:
           - Attribute:       DW_AT_name
             Form:            DW_FORM_strp
           - Attribute:       DW_AT_low_pc
             Form:            DW_FORM_addr
           - Attribute:       DW_AT_high_pc
             Form:            DW_FORM_addr
     debug_info:
-      - Length:
-          TotalLength:     73
+      - Length:          73
         Version:         4
         AbbrOffset:      0
         AddrSize:        8
         Entries:
           - AbbrCode:        0x00000001
             Values:
               - Value:           0x0000000000001000
               - Value:           0x0000000000002000

llvm/unittests/DebugInfo/DWARF/DWARFDieTest.cpp

debug_abbrev:
             Form:            DW_FORM_sec_offset
           - Attribute:       DW_AT_data_member_location
             Form:            DW_FORM_exprloc
           - Attribute:       DW_AT_vtable_elem_location
             Form:            DW_FORM_sec_offset
           - Attribute:       DW_AT_call_data_location
             Form:            DW_FORM_sec_offset
     debug_info:
-      - Length:
-          TotalLength:     0
+      - Length:          0
         Version:         5
         UnitType:        DW_UT_compile
         AbbrOffset:      0
         AddrSize:        4
         Entries:
           - AbbrCode:        0x00000001
             Values:
               - Value:           12

llvm/unittests/DebugInfo/GSYM/GSYMTest.cpp

- Code:            0x00000002
       Attributes:
         - Attribute:       DW_AT_name
           Form:            DW_FORM_strp
         - Attribute:       DW_AT_low_pc
           Form:            DW_FORM_addr
         - Attribute:       DW_AT_high_pc
           Form:            DW_FORM_addr
   debug_info:
-    - Length:
-        TotalLength:     52
+    - Length:          52
       Version:         4
       AbbrOffset:      0
       AddrSize:        8
       Entries:
         - AbbrCode:        0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000001000
- Code:            0x00000002
       Attributes:
         - Attribute:       DW_AT_name
           Form:            DW_FORM_strp
         - Attribute:       DW_AT_low_pc
           Form:            DW_FORM_addr
         - Attribute:       DW_AT_high_pc
           Form:            DW_FORM_data4
   debug_info:
-    - Length:
-        TotalLength:     44
+    - Length:          44
       Version:         4
       AbbrOffset:      0
       AddrSize:        8
       Entries:
         - AbbrCode:        0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000001000
- Code:            0x00000004
       Attributes:
         - Attribute:       DW_AT_name
           Form:            DW_FORM_strp
         - Attribute:       DW_AT_type
           Form:            DW_FORM_ref4
         - Attribute:       DW_AT_artificial
           Form:            DW_FORM_flag_present
   debug_info:
-    - Length:
-        TotalLength:     68
+    - Length:          68
       Version:         4
       AbbrOffset:      0
       AddrSize:        8
       Entries:
         - AbbrCode:        0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000001000
- Code:            0x00000002
       Attributes:
         - Attribute:       DW_AT_name
           Form:            DW_FORM_strp
         - Attribute:       DW_AT_low_pc
           Form:            DW_FORM_addr
         - Attribute:       DW_AT_high_pc
           Form:            DW_FORM_data4
   debug_info:
-    - Length:
-        TotalLength:     78
+    - Length:          78
       Version:         4
       AbbrOffset:      0
       AddrSize:        8
       Entries:
         - AbbrCode:        0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000001000
- Code:            0x00000003
           Form:            DW_FORM_addr
         - Attribute:       DW_AT_high_pc
           Form:            DW_FORM_data4
         - Attribute:       DW_AT_call_file
           Form:            DW_FORM_data4
         - Attribute:       DW_AT_call_line
           Form:            DW_FORM_data4
   debug_info:
-    - Length:
-        TotalLength:     74
+    - Length:          74
       Version:         4
       AbbrOffset:      0
       AddrSize:        8
       Entries:
         - AbbrCode:        0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000001000
- Code:            0x00000003
           Form:            DW_FORM_addr
         - Attribute:       DW_AT_high_pc
           Form:            DW_FORM_data4
         - Attribute:       DW_AT_decl_file
           Form:            DW_FORM_data1
         - Attribute:       DW_AT_decl_line
           Form:            DW_FORM_data1
   debug_info:
-    - Length:
-        TotalLength:     103
+    - Length:          103
       Version:         4
       AbbrOffset:      0
       AddrSize:        8
       Entries:
         - AbbrCode:        0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000001000
TEST(GSYMTest, TestDWARFDeadStripAddr4) {
   //
   // 0x00000041:   DW_TAG_subprogram
   //                 DW_AT_name ("stripped3")
   //                 DW_AT_low_pc (0x0000000000004000)
   //                 DW_AT_high_pc  (0x0000000000003fff)
   //
   // 0x0000004e:   NULL
 
-
   StringRef yamldata = R"(
   debug_str:
     - ''
     - '/tmp/main.c'
     - main
     - stripped1
     - stripped2
     - stripped3
- Code:            0x00000003
       Attributes:
         - Attribute:       DW_AT_name
           Form:            DW_FORM_strp
         - Attribute:       DW_AT_low_pc
           Form:            DW_FORM_addr
         - Attribute:       DW_AT_high_pc
           Form:            DW_FORM_addr
   debug_info:
-    - Length:
-        TotalLength:     75
+    - Length:          75
       Version:         4
       AbbrOffset:      0
       AddrSize:        4
       Entries:
         - AbbrCode:        0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000001000
- Code:            0x00000003
       Attributes:
         - Attribute:       DW_AT_name
           Form:            DW_FORM_strp
         - Attribute:       DW_AT_low_pc
           Form:            DW_FORM_addr
         - Attribute:       DW_AT_high_pc
           Form:            DW_FORM_addr
   debug_info:
-    - Length:
-        TotalLength:     103
+    - Length:          103
       Version:         4
       AbbrOffset:      0
       AddrSize:        8
       Entries:
         - AbbrCode:        0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000001000