Higuoxing created this revision.
Higuoxing added reviewers: jhenderson, grimar, MaskRay.
Herald added subscribers: llvm-commits, lldb-commits, cmtice, hiraditya, emaste.
Herald added a reviewer: espindola.
Herald added a reviewer: alexshap.
Herald added a reviewer: rupprecht.
Herald added projects: LLDB, LLVM.
Higuoxing requested review of this revision.
Herald added a subscriber: JDevlieghere.

This patch renames some mapping keys:

AbbrOffset -> DebugAbbrevOffset
AddrSize   -> AddressSize
AbbrCode   -> AbbrevCode


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D85289

Files:
  lldb/test/API/functionalities/source-map/a.yaml
  lldb/unittests/Expression/DWARFExpressionTest.cpp
  lldb/unittests/Symbol/Inputs/inlined-functions.yaml
  lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp
  lldb/unittests/SymbolFile/DWARF/XcodeSDKModuleTests.cpp
  llvm/lib/ObjectYAML/DWARFYAML.cpp
  llvm/test/ObjectYAML/MachO/DWARF-debug_info.yaml
  llvm/test/ObjectYAML/MachO/DWARF-debug_line.yaml
  llvm/test/ObjectYAML/MachO/DWARF-debug_ranges.yaml
  llvm/test/ObjectYAML/MachO/DWARF2-AddrSize8-FormValues.yaml
  llvm/test/ObjectYAML/MachO/DWARF5-debug_info.yaml
  llvm/test/tools/llvm-dwarfdump/X86/verify_overlapping_cu_ranges.yaml
  llvm/test/tools/llvm-gsymutil/ARM_AArch64/fat-macho-dwarf.yaml
  llvm/test/tools/llvm-gsymutil/X86/mach-dwarf.yaml
  llvm/test/tools/llvm-objcopy/MachO/Inputs/strip-all-with-dwarf.yaml
  llvm/test/tools/yaml2obj/ELF/DWARF/debug-info.yaml
  llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
  llvm/unittests/DebugInfo/DWARF/DWARFDieTest.cpp
  llvm/unittests/DebugInfo/GSYM/GSYMTest.cpp

Index: llvm/unittests/DebugInfo/GSYM/GSYMTest.cpp
===================================================================
--- llvm/unittests/DebugInfo/GSYM/GSYMTest.cpp
+++ llvm/unittests/DebugInfo/GSYM/GSYMTest.cpp
@@ -1437,23 +1437,23 @@
         - Attribute:       DW_AT_high_pc
           Form:            DW_FORM_addr
   debug_info:
-    - Length:          52
-      Version:         4
-      AbbrOffset:      0
-      AddrSize:        8
+    - Length:            52
+      Version:           4
+      DebugAbbrevOffset: 0
+      AddressSize:       8
       Entries:
-        - AbbrCode:        0x00000001
+        - AbbrevCode: 0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000001000
             - Value:           0x0000000000002000
             - Value:           0x0000000000000004
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:
             - Value:           0x000000000000000D
             - Value:           0x0000000000001000
             - Value:           0x0000000000002000
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:
   )";
   auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
@@ -1516,23 +1516,23 @@
         - Attribute:       DW_AT_high_pc
           Form:            DW_FORM_data4
   debug_info:
-    - Length:          44
-      Version:         4
-      AbbrOffset:      0
-      AddrSize:        8
+    - Length:            44
+      Version:           4
+      DebugAbbrevOffset: 0
+      AddressSize:       8
       Entries:
-        - AbbrCode:        0x00000001
+        - AbbrevCode: 0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000001000
             - Value:           0x0000000000001000
             - Value:           0x0000000000000004
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:
             - Value:           0x000000000000000D
             - Value:           0x0000000000001000
             - Value:           0x0000000000001000
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:
   )";
   auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
@@ -1615,35 +1615,35 @@
         - Attribute:       DW_AT_artificial
           Form:            DW_FORM_flag_present
   debug_info:
-    - Length:          68
-      Version:         4
-      AbbrOffset:      0
-      AddrSize:        8
+    - Length:            68
+      Version:           4
+      DebugAbbrevOffset: 0
+      AddressSize:       8
       Entries:
-        - AbbrCode:        0x00000001
+        - AbbrevCode: 0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000001000
             - Value:           0x0000000000002000
             - Value:           0x0000000000000004
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:
             - Value:           0x000000000000000D
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:
             - Value:           0x0000000000000011
             - Value:           0x0000000000001000
             - Value:           0x0000000000002000
-        - AbbrCode:        0x00000004
+        - AbbrevCode: 0x00000004
           Values:
             - Value:           0x0000000000000016
             - Value:           0x0000000000000022
             - Value:           0x0000000000000001
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:
   )";
   auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
@@ -1719,33 +1719,33 @@
         - Attribute:       DW_AT_high_pc
           Form:            DW_FORM_data4
   debug_info:
-    - Length:          78
-      Version:         4
-      AbbrOffset:      0
-      AddrSize:        8
+    - Length:            78
+      Version:           4
+      DebugAbbrevOffset: 0
+      AddressSize:       8
       Entries:
-        - AbbrCode:        0x00000001
+        - AbbrevCode: 0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000001000
             - Value:           0x0000000000001000
             - Value:           0x0000000000000004
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:
             - Value:           0x000000000000000D
             - Value:           0x0000000000001000
             - Value:           0x0000000000001000
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:
             - Value:           0x0000000000000012
             - Value:           0x0000000000000000
             - Value:           0x0000000000000100
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:
             - Value:           0x0000000000000020
             - Value:           0x0000000000000000
             - Value:           0x0000000000000040
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:
 
   )";
@@ -1832,33 +1832,33 @@
         - Attribute:       DW_AT_call_line
           Form:            DW_FORM_data4
   debug_info:
-    - Length:          74
-      Version:         4
-      AbbrOffset:      0
-      AddrSize:        8
+    - Length:            74
+      Version:           4
+      DebugAbbrevOffset: 0
+      AddressSize:       8
       Entries:
-        - AbbrCode:        0x00000001
+        - AbbrevCode: 0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000001000
             - Value:           0x0000000000001000
             - Value:           0x0000000000000004
             - Value:           0x0000000000000000
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:
             - Value:           0x000000000000000D
             - Value:           0x0000000000001000
             - Value:           0x0000000000001000
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:
             - Value:           0x0000000000000012
             - Value:           0x0000000000001100
             - Value:           0x0000000000000100
             - Value:           0x0000000000000001
             - Value:           0x000000000000000A
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:
   debug_line:
     - Length:          96
@@ -2087,43 +2087,43 @@
         - Attribute:       DW_AT_decl_line
           Form:            DW_FORM_data1
   debug_info:
-    - Length:          103
-      Version:         4
-      AbbrOffset:      0
-      AddrSize:        8
+    - Length:            103
+      Version:           4
+      DebugAbbrevOffset: 0
+      AddressSize:       8
       Entries:
-        - AbbrCode:        0x00000001
+        - AbbrevCode: 0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000001000
             - Value:           0x0000000000001000
             - Value:           0x0000000000000004
             - Value:           0x0000000000000000
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:
             - Value:           0x000000000000000D
             - Value:           0x0000000000001000
             - Value:           0x0000000000001000
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:
             - Value:           0x000000000000001B
             - Value:           0x0000000000002000
             - Value:           0x0000000000001000
             - Value:           0x0000000000000001
             - Value:           0x0000000000000014
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:
             - Value:           0x000000000000002B
             - Value:           0x0000000000003000
             - Value:           0x0000000000001000
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:
             - Value:           0x000000000000003C
             - Value:           0x0000000000004000
             - Value:           0x0000000000001000
             - Value:           0x0000000000000001
             - Value:           0x0000000000000028
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
   debug_line:
     - Length:          92
@@ -2336,38 +2336,38 @@
         - Attribute:       DW_AT_high_pc
           Form:            DW_FORM_addr
   debug_info:
-    - Length:          75
-      Version:         4
-      AbbrOffset:      0
-      AddrSize:        4
+    - Length:            75
+      Version:           4
+      DebugAbbrevOffset: 0
+      AddressSize:       4
       Entries:
-        - AbbrCode:        0x00000001
+        - AbbrevCode: 0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000001000
             - Value:           0x0000000000001000
             - Value:           0x0000000000000004
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:
             - Value:           0x000000000000000D
             - Value:           0x0000000000001000
             - Value:           0x0000000000001000
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:
             - Value:           0x0000000000000012
             - Value:           0x00000000FFFFFFFF
             - Value:           0x0000000000000001
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:
             - Value:           0x000000000000001C
             - Value:           0x0000000000003000
             - Value:           0x0000000000003000
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:
             - Value:           0x0000000000000026
             - Value:           0x0000000000004000
             - Value:           0x0000000000003FFF
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
   )";
   auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
@@ -2478,38 +2478,38 @@
         - Attribute:       DW_AT_high_pc
           Form:            DW_FORM_addr
   debug_info:
-    - Length:          103
-      Version:         4
-      AbbrOffset:      0
-      AddrSize:        8
+    - Length:            103
+      Version:           4
+      DebugAbbrevOffset: 0
+      AddressSize:       8
       Entries:
-        - AbbrCode:        0x00000001
+        - AbbrevCode: 0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000001000
             - Value:           0x0000000000001000
             - Value:           0x0000000000000004
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:
             - Value:           0x000000000000000D
             - Value:           0x0000000000001000
             - Value:           0x0000000000001000
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:
             - Value:           0x0000000000000012
             - Value:           0xFFFFFFFFFFFFFFFF
             - Value:           0x0000000000000001
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:
             - Value:           0x000000000000001C
             - Value:           0x0000000000003000
             - Value:           0x0000000000003000
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:
             - Value:           0x0000000000000026
             - Value:           0x0000000000004000
             - Value:           0x0000000000003FFF
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
   )";
   auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
Index: llvm/unittests/DebugInfo/DWARF/DWARFDieTest.cpp
===================================================================
--- llvm/unittests/DebugInfo/DWARF/DWARFDieTest.cpp
+++ llvm/unittests/DebugInfo/DWARF/DWARFDieTest.cpp
@@ -34,12 +34,12 @@
           - Attribute:       DW_AT_call_data_location
             Form:            DW_FORM_sec_offset
     debug_info:
-      - Version:         5
-        UnitType:        DW_UT_compile
-        AbbrOffset:      0
-        AddrSize:        4
+      - Version:           5
+        UnitType:          DW_UT_compile
+        DebugAbbrevOffset: 0
+        AddressSize:       4
         Entries:
-          - AbbrCode:        0x00000001
+          - AbbrevCode: 0x00000001
             Values:
               - Value:           12
               - Value:           0x0000000000000001
Index: llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
===================================================================
--- llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
+++ llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
@@ -1368,13 +1368,13 @@
                          "    Children:        DW_CHILDREN_yes\n"
                          "    Attributes:\n"
                          "debug_info:\n"
-                         "  - Version:         4\n"
-                         "    AbbrOffset:      0\n"
-                         "    AddrSize:        8\n"
+                         "  - Version:           4\n"
+                         "    DebugAbbrevOffset: 0\n"
+                         "    AddressSize:       8\n"
                          "    Entries:\n"
-                         "      - AbbrCode:        0x00000001\n"
+                         "      - AbbrevCode: 0x00000001\n"
                          "        Values:\n"
-                         "      - AbbrCode:        0x00000000\n"
+                         "      - AbbrevCode: 0x00000000\n"
                          "        Values:\n";
 
   auto ErrOrSections = DWARFYAML::emitDebugSections(StringRef(yamldata));
@@ -1900,19 +1900,19 @@
           - Attribute:       DW_AT_type
             Form:            DW_FORM_ref4
     debug_info:
-      - Length:          22
-        Version:         4
-        AbbrOffset:      0
-        AddrSize:        8
+      - Length:            22
+        Version:           4
+        DebugAbbrevOffset: 0
+        AddressSize:       8
         Entries:
-          - AbbrCode:        0x00000001
+          - AbbrevCode: 0x00000001
             Values:
               - Value:           0x0000000000000001
-          - AbbrCode:        0x00000002
+          - AbbrevCode: 0x00000002
             Values:
               - Value:           0x000000000000000D
               - Value:           0x0000000000001234
-          - AbbrCode:        0x00000000
+          - AbbrevCode: 0x00000000
             Values:
   )";
   auto ErrOrSections = DWARFYAML::emitDebugSections(StringRef(yamldata));
@@ -1948,19 +1948,19 @@
           - Attribute:       DW_AT_type
             Form:            DW_FORM_ref_addr
     debug_info:
-      - Length:          22
-        Version:         4
-        AbbrOffset:      0
-        AddrSize:        8
+      - Length:            22
+        Version:           4
+        DebugAbbrevOffset: 0
+        AddressSize:       8
         Entries:
-          - AbbrCode:        0x00000001
+          - AbbrevCode: 0x00000001
             Values:
               - Value:           0x0000000000000001
-          - AbbrCode:        0x00000002
+          - AbbrevCode: 0x00000002
             Values:
               - Value:           0x000000000000000D
               - Value:           0x0000000000001234
-          - AbbrCode:        0x00000000
+          - AbbrevCode: 0x00000000
             Values:
   )";
   auto ErrOrSections = DWARFYAML::emitDebugSections(StringRef(yamldata));
@@ -1988,12 +1988,12 @@
           - Attribute:       DW_AT_ranges
             Form:            DW_FORM_sec_offset
     debug_info:
-      - Length:          16
-        Version:         4
-        AbbrOffset:      0
-        AddrSize:        8
+      - Length:            16
+        Version:           4
+        DebugAbbrevOffset: 0
+        AddressSize:       8
         Entries:
-          - AbbrCode:        0x00000001
+          - AbbrevCode: 0x00000001
             Values:
               - Value:           0x0000000000000001
               - Value:           0x0000000000001000
@@ -2025,13 +2025,13 @@
           - Attribute:       DW_AT_ranges
             Form:            DW_FORM_sec_offset
     debug_info:
-      - Length:          17
-        Version:         5
-        UnitType:        DW_UT_compile
-        AbbrOffset:      0
-        AddrSize:        8
+      - Length:            17
+        Version:           5
+        UnitType:          DW_UT_compile
+        DebugAbbrevOffset: 0
+        AddressSize:       8
         Entries:
-          - AbbrCode:        0x00000001
+          - AbbrevCode: 0x00000001
             Values:
               - Value:           0x0000000000000001
               - Value:           0x0000000000001000
@@ -2062,12 +2062,12 @@
           - Attribute:       DW_AT_stmt_list
             Form:            DW_FORM_sec_offset
     debug_info:
-      - Length:          16
-        Version:         4
-        AbbrOffset:      0
-        AddrSize:        8
+      - Length:            16
+        Version:           4
+        DebugAbbrevOffset: 0
+        AddressSize:       8
         Entries:
-          - AbbrCode:        0x00000001
+          - AbbrevCode: 0x00000001
             Values:
               - Value:           0x0000000000000001
               - Value:           0x0000000000001000
@@ -2096,12 +2096,12 @@
           - Attribute:       DW_AT_name
             Form:            DW_FORM_strp
     debug_info:
-      - Length:          12
-        Version:         4
-        AbbrOffset:      0
-        AddrSize:        8
+      - Length:            12
+        Version:           4
+        DebugAbbrevOffset: 0
+        AddressSize:       8
         Entries:
-          - AbbrCode:        0x00000001
+          - AbbrevCode: 0x00000001
             Values:
               - Value:           0x0000000000001234
   )";
@@ -2137,19 +2137,19 @@
           - Attribute:       DW_AT_type
             Form:            DW_FORM_ref_addr
     debug_info:
-      - Length:          22
-        Version:         4
-        AbbrOffset:      0
-        AddrSize:        8
+      - Length:            22
+        Version:           4
+        DebugAbbrevOffset: 0
+        AddressSize:       8
         Entries:
-          - AbbrCode:        0x00000001
+          - AbbrevCode: 0x00000001
             Values:
               - Value:           0x0000000000000001
-          - AbbrCode:        0x00000002
+          - AbbrevCode: 0x00000002
             Values:
               - Value:           0x000000000000000D
               - Value:           0x0000000000000011
-          - AbbrCode:        0x00000000
+          - AbbrevCode: 0x00000000
             Values:
   )";
   auto ErrOrSections = DWARFYAML::emitDebugSections(StringRef(yamldata));
@@ -2178,12 +2178,12 @@
           - Attribute:       DW_AT_stmt_list
             Form:            DW_FORM_sec_offset
     debug_info:
-      - Length:          16
-        Version:         4
-        AbbrOffset:      0
-        AddrSize:        8
+      - Length:            16
+        Version:           4
+        DebugAbbrevOffset: 0
+        AddressSize:       8
         Entries:
-          - AbbrCode:        0x00000001
+          - AbbrevCode: 0x00000001
             Values:
               - Value:           0x0000000000000001
               - Value:           0x0000000000000000
@@ -2246,12 +2246,12 @@
           - Attribute:       DW_AT_stmt_list
             Form:            DW_FORM_sec_offset
     debug_info:
-      - Length:          16
-        Version:         4
-        AbbrOffset:      0
-        AddrSize:        8
+      - Length:            16
+        Version:           4
+        DebugAbbrevOffset: 0
+        AddressSize:       8
         Entries:
-          - AbbrCode:        0x00000001
+          - AbbrevCode: 0x00000001
             Values:
               - Value:           0x0000000000000001
               - Value:           0x0000000000000000
@@ -2316,12 +2316,12 @@
           - Attribute:       DW_AT_stmt_list
             Form:            DW_FORM_sec_offset
     debug_info:
-      - Length:          16
-        Version:         4
-        AbbrOffset:      0
-        AddrSize:        8
+      - Length:            16
+        Version:           4
+        DebugAbbrevOffset: 0
+        AddressSize:       8
         Entries:
-          - AbbrCode:        0x00000001
+          - AbbrevCode: 0x00000001
             Values:
               - Value:           0x0000000000000001
               - Value:           0x0000000000000000
@@ -2387,12 +2387,12 @@
           - Attribute:       DW_AT_stmt_list
             Form:            DW_FORM_sec_offset
     debug_info:
-      - Length:          16
-        Version:         4
-        AbbrOffset:      0
-        AddrSize:        8
+      - Length:            16
+        Version:           4
+        DebugAbbrevOffset: 0
+        AddressSize:       8
         Entries:
-          - AbbrCode:        0x00000001
+          - AbbrevCode: 0x00000001
             Values:
               - Value:           0x0000000000000001
               - Value:           0x0000000000000000
@@ -2463,21 +2463,21 @@
           - Attribute:       DW_AT_stmt_list
             Form:            DW_FORM_sec_offset
     debug_info:
-      - Length:          16
-        Version:         4
-        AbbrOffset:      0
-        AddrSize:        8
+      - Length:            16
+        Version:           4
+        DebugAbbrevOffset: 0
+        AddressSize:       8
         Entries:
-          - AbbrCode:        0x00000001
+          - AbbrevCode: 0x00000001
             Values:
               - Value:           0x0000000000000001
               - Value:           0x0000000000000000
-      - Length:          16
-        Version:         4
-        AbbrOffset:      0
-        AddrSize:        8
+      - Length:            16
+        Version:           4
+        DebugAbbrevOffset: 0
+        AddressSize:       8
         Entries:
-          - AbbrCode:        0x00000001
+          - AbbrevCode: 0x00000001
             Values:
               - Value:           0x000000000000000D
               - Value:           0x0000000000000000
@@ -2588,21 +2588,21 @@
           - Attribute:       DW_AT_high_pc
             Form:            DW_FORM_addr
     debug_info:
-      - Length:          46
-        Version:         4
-        AbbrOffset:      0
-        AddrSize:        8
+      - Length:            46
+        Version:           4
+        DebugAbbrevOffset: 0
+        AddressSize:       8
         Entries:
-          - AbbrCode:        0x00000001
+          - AbbrevCode: 0x00000001
             Values:
               - Value:           0x0000000000001000
               - Value:           0x0000000000001500
               - Value:           0x0000000000000001
-          - AbbrCode:        0x00000002
+          - AbbrevCode: 0x00000002
             Values:
               - Value:           0x0000000000001000
               - Value:           0x0000000000002000
-          - AbbrCode:        0x00000000
+          - AbbrevCode: 0x00000000
             Values:
   )";
   auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
@@ -2647,26 +2647,26 @@
           - Attribute:       DW_AT_high_pc
             Form:            DW_FORM_addr
     debug_info:
-      - Length:          52
-        Version:         4
-        AbbrOffset:      0
-        AddrSize:        8
+      - Length:            52
+        Version:           4
+        DebugAbbrevOffset: 0
+        AddressSize:       8
         Entries:
-          - AbbrCode:        0x00000001
+          - AbbrevCode: 0x00000001
             Values:
               - Value:           0x0000000000000001
-          - AbbrCode:        0x00000002
+          - AbbrevCode: 0x00000002
             Values:
               - Value:           0x000000000000000D
               - Value:           0x0000000000001000
               - Value:           0x0000000000002000
-          - AbbrCode:        0x00000003
+          - AbbrevCode: 0x00000003
             Values:
               - Value:           0x0000000000001000
               - Value:           0x0000000000002001
-          - AbbrCode:        0x00000000
+          - AbbrevCode: 0x00000000
             Values:
-          - AbbrCode:        0x00000000
+          - AbbrevCode: 0x00000000
             Values:
   )";
   auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
@@ -2704,25 +2704,25 @@
           - Attribute:       DW_AT_high_pc
             Form:            DW_FORM_addr
     debug_info:
-      - Length:          55
-        Version:         4
-        AbbrOffset:      0
-        AddrSize:        8
+      - Length:            55
+        Version:           4
+        DebugAbbrevOffset: 0
+        AddressSize:       8
         Entries:
-          - AbbrCode:        0x00000001
+          - AbbrevCode: 0x00000001
             Values:
               - Value:           0x0000000000000001
-          - AbbrCode:        0x00000002
+          - AbbrevCode: 0x00000002
             Values:
               - Value:           0x000000000000000D
               - Value:           0x0000000000001000
               - Value:           0x0000000000002000
-          - AbbrCode:        0x00000002
+          - AbbrevCode: 0x00000002
             Values:
               - Value:           0x0000000000000012
               - Value:           0x0000000000001FFF
               - Value:           0x0000000000002000
-          - AbbrCode:        0x00000000
+          - AbbrevCode: 0x00000000
             Values:
   )";
   auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
@@ -2770,32 +2770,32 @@
           - Attribute:       DW_AT_high_pc
             Form:            DW_FORM_addr
     debug_info:
-      - Length:          85
-        Version:         4
-        AbbrOffset:      0
-        AddrSize:        8
+      - Length:            85
+        Version:           4
+        DebugAbbrevOffset: 0
+        AddressSize:       8
         Entries:
-          - AbbrCode:        0x00000001
+          - AbbrevCode: 0x00000001
             Values:
               - Value:           0x0000000000001000
               - Value:           0x0000000000002000
               - Value:           0x0000000000000001
-          - AbbrCode:        0x00000002
+          - AbbrevCode: 0x00000002
             Values:
               - Value:           0x000000000000000D
               - Value:           0x0000000000001000
               - Value:           0x0000000000002000
-          - AbbrCode:        0x00000003
+          - AbbrevCode: 0x00000003
             Values:
               - Value:           0x0000000000001100
               - Value:           0x0000000000001300
-          - AbbrCode:        0x00000003
+          - AbbrevCode: 0x00000003
             Values:
               - Value:           0x00000000000012FF
               - Value:           0x0000000000001300
-          - AbbrCode:        0x00000000
+          - AbbrevCode: 0x00000000
             Values:
-          - AbbrCode:        0x00000000
+          - AbbrevCode: 0x00000000
             Values:
   )";
   auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
@@ -2831,20 +2831,20 @@
           - Attribute:       DW_AT_high_pc
             Form:            DW_FORM_addr
     debug_info:
-      - Length:          34
-        Version:         4
-        AbbrOffset:      0
-        AddrSize:        8
+      - Length:            34
+        Version:           4
+        DebugAbbrevOffset: 0
+        AddressSize:       8
         Entries:
-          - AbbrCode:        0x00000001
+          - AbbrevCode: 0x00000001
             Values:
               - Value:           0x0000000000000001
-          - AbbrCode:        0x00000002
+          - AbbrevCode: 0x00000002
             Values:
               - Value:           0x000000000000000D
               - Value:           0x0000000000001000
               - Value:           0x0000000000000900
-          - AbbrCode:        0x00000000
+          - AbbrevCode: 0x00000000
             Values:
   )";
   auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
@@ -2887,27 +2887,27 @@
           - Attribute:       DW_AT_high_pc
             Form:            DW_FORM_addr
     debug_info:
-      - Length:          71
-        Version:         4
-        AbbrOffset:      0
-        AddrSize:        8
+      - Length:            71
+        Version:           4
+        DebugAbbrevOffset: 0
+        AddressSize:       8
         Entries:
-          - AbbrCode:        0x00000001
+          - AbbrevCode: 0x00000001
             Values:
               - Value:           0x0000000000001000
               - Value:           0x0000000000002000
               - Value:           0x0000000000000001
-          - AbbrCode:        0x00000002
+          - AbbrevCode: 0x00000002
             Values:
               - Value:           0x000000000000000D
               - Value:           0x0000000000001000
               - Value:           0x0000000000002000
-          - AbbrCode:        0x00000002
+          - AbbrevCode: 0x00000002
             Values:
               - Value:           0x0000000000000012
               - Value:           0x0000000000002000
               - Value:           0x0000000000002000
-          - AbbrCode:        0x00000000
+          - AbbrevCode: 0x00000000
             Values:
   )";
   auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
@@ -2949,31 +2949,31 @@
           - Attribute:       DW_AT_high_pc
             Form:            DW_FORM_addr
     debug_info:
-      - Length:          73
-        Version:         4
-        AbbrOffset:      0
-        AddrSize:        8
+      - Length:            73
+        Version:           4
+        DebugAbbrevOffset: 0
+        AddressSize:       8
         Entries:
-          - AbbrCode:        0x00000001
+          - AbbrevCode: 0x00000001
             Values:
               - Value:           0x0000000000001000
               - Value:           0x0000000000002000
               - Value:           0x0000000000000001
-          - AbbrCode:        0x00000002
+          - AbbrevCode: 0x00000002
             Values:
               - Value:           0x000000000000000D
               - Value:           0x0000000000001000
               - Value:           0x0000000000001500
-          - AbbrCode:        0x00000002
+          - AbbrevCode: 0x00000002
             Values:
               - Value:           0x0000000000000012
               - Value:           0x0000000000001500
               - Value:           0x0000000000002000
-          - AbbrCode:        0x00000000
+          - AbbrevCode: 0x00000000
             Values:
-          - AbbrCode:        0x00000000
+          - AbbrevCode: 0x00000000
             Values:
-          - AbbrCode:        0x00000000
+          - AbbrevCode: 0x00000000
             Values:
   )";
   auto ErrOrSections = DWARFYAML::emitDebugSections(yamldata);
Index: llvm/test/tools/yaml2obj/ELF/DWARF/debug-info.yaml
===================================================================
--- llvm/test/tools/yaml2obj/ELF/DWARF/debug-info.yaml
+++ llvm/test/tools/yaml2obj/ELF/DWARF/debug-info.yaml
@@ -206,13 +206,13 @@
         - Attribute: 0x01
           Form:      DW_FORM_addrx4         ## 0x2c
   debug_info:
-    - Length:     0x1234
-      Version:    5
-      UnitType:   DW_UT_type
-      AbbrOffset: 0x1234
-      AddrSize:   4
+    - Length:            0x1234
+      Version:           5
+      UnitType:          DW_UT_type
+      DebugAbbrevOffset: 0x1234
+      AddressSize:       4
       Entries:
-        - AbbrCode: 1
+        - AbbrevCode: 1
           Values:
             - Value: 0x12345678         ## DW_FORM_addr
             - BlockData:                ## DW_FORM_block2
@@ -267,22 +267,22 @@
             - Value: 0x1234             ## DW_FORM_addrx2
             - Value: 0x123456           ## DW_FORM_addrx3 (unimplemented)
             - Value: 0x12345678         ## DW_FORM_addrx4
-    - Length:     0x1234
-      Version:    5
+    - Length:            0x1234
+      Version:           5
       ## Test another unit type.
-      UnitType:   DW_UT_compile
-      AbbrOffset: 0x1234
-      AddrSize:   4
+      UnitType:          DW_UT_compile
+      DebugAbbrevOffset: 0x1234
+      AddressSize:       4
       Entries:
-        - AbbrCode: 0
-          Values:   []
-    - Length:     0x5678
+        - AbbrevCode: 0
+          Values:     []
+    - Length:            0x5678
       ## Test DWARFv4
-      Version:    4
-      AbbrOffset: 0x5678
-      AddrSize:   4
+      Version:           4
+      DebugAbbrevOffset: 0x5678
+      AddressSize:       4
       Entries:
-        - AbbrCode: 1
+        - AbbrevCode: 1
           Values:
             - Value: 0x12345678 ## DW_FORM_addr
             - BlockData:        ## DW_FORM_block2
@@ -449,12 +449,12 @@
       Children:   DW_CHILDREN_no
       Attributes: []
   debug_info:
-    - Length:     0x1234
-      Version:    5
-      UnitType:   DW_UT_type
-      AbbrOffset: 0x1234
-      AddrSize:   4
-      Entries:    []
+    - Length:            0x1234
+      Version:           5
+      UnitType:          DW_UT_type
+      DebugAbbrevOffset: 0x1234
+      AddressSize:       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.
@@ -478,12 +478,12 @@
       Children:   DW_CHILDREN_no
       Attributes: []
   debug_info:
-    - Length:     0x1234
-      Version:    5
-      UnitType:   DW_UT_type
-      AbbrOffset: 0x1234
-      AddrSize:   4
-      Entries:    []
+    - Length:            0x1234
+      Version:           5
+      UnitType:          DW_UT_type
+      DebugAbbrevOffset: 0x1234
+      AddressSize:       4
+      Entries:           []
 
 ## f) Test that all the properties can be overridden by the section header when
 ## the "debug_info" entry doesn't exist.
@@ -546,14 +546,14 @@
       Children:   DW_CHILDREN_no
       Attributes: []
   debug_info:
-    - Length:     0x1234
-      Version:    5
-      UnitType:   DW_UT_type
-      AbbrOffset: 0x1234
-      AddrSize:   4
+    - Length:            0x1234
+      Version:           5
+      UnitType:          DW_UT_type
+      DebugAbbrevOffset: 0x1234
+      AddressSize:       4
       Entries:
-        - AbbrCode: 0
-          Values:   []
+        - AbbrevCode: 0
+          Values:     []
 
 ## h) Test that yaml2obj doesn't crash when the 'Entries' of a compilation unit is empty.
 
@@ -574,12 +574,12 @@
   Machine: EM_X86_64
 DWARF:
   debug_info:
-    - Length:     0x1234
-      Version:    5
-      UnitType:   DW_UT_type
-      AbbrOffset: 0x1234
-      AddrSize:   4
-      Entries:    []
+    - Length:            0x1234
+      Version:           5
+      UnitType:          DW_UT_type
+      DebugAbbrevOffset: 0x1234
+      AddressSize:       4
+      Entries:           []
 
 ## h) Test that yaml2obj emits values in the DIE according to the abbreviation whose
 ## index is equal to the value in 'AbbrevCode'.
@@ -625,25 +625,25 @@
         - Attribute: DW_AT_high_pc
           Form:      DW_FORM_data4
   debug_info:
-    - Length:     0x1234
-      Version:    5
-      UnitType:   DW_UT_type
-      AbbrOffset: 0x1234
-      AddrSize:   4
+    - Length:            0x1234
+      Version:           5
+      UnitType:          DW_UT_type
+      DebugAbbrevOffset: 0x1234
+      AddressSize:       4
       Entries:
         ## Test that yaml2obj emits values when the abbrev code is specified.
-        - AbbrCode: 2
+        - AbbrevCode: 2
           Values:
             - Value: 0x1234
             - Value: 0x87654321
         ## Test that yaml2obj emits values when the abbrev code is specified to
         ## be lower than the first abbrev.
-        - AbbrCode: 1
+        - AbbrevCode: 1
           Values:
             - Value: 0x87654321
             - Value: 0x1234
         ## Test that yaml2obj ignores the contents of entries with abbrev code 0.
-        - AbbrCode: 0
+        - AbbrevCode: 0
           Values:
             - Value: 0x1234
 
@@ -663,13 +663,13 @@
   Machine: EM_X86_64
 DWARF:
   debug_info:
-    - Length:     0x1234
-      Version:    5
-      UnitType:   DW_UT_type
-      AbbrOffset: 0x1234
-      AddrSize:   4
+    - Length:            0x1234
+      Version:           5
+      UnitType:          DW_UT_type
+      DebugAbbrevOffset: 0x1234
+      AddressSize:       4
       Entries:
-        - AbbrCode: 1
+        - AbbrevCode: 1
           Values:
             - Value: 0x1234
 
@@ -698,13 +698,13 @@
   Machine: EM_X86_64
 DWARF:
   debug_info:
-    - Format:     DWARF64
-      Length:     0x0c
-      Version:    5
-      UnitType:   DW_UT_type
-      AbbrOffset: 0x1234
-      AddrSize:   8
-      Entries:    []
+    - Format:            DWARF64
+      Length:            0x0c
+      Version:           5
+      UnitType:          DW_UT_type
+      DebugAbbrevOffset: 0x1234
+      AddressSize:       8
+      Entries:           []
 
 ## DWARFv4 unit header.
 
@@ -729,12 +729,12 @@
   Machine: EM_X86_64
 DWARF:
   debug_info:
-    - Format:     DWARF64
-      Length:     0x0c
-      Version:    4
-      AbbrOffset: 0x1234
-      AddrSize:   8
-      Entries:    []
+    - Format:            DWARF64
+      Length:            0x0c
+      Version:           4
+      DebugAbbrevOffset: 0x1234
+      AddressSize:       8
+      Entries:           []
 
 ## k) Test that yaml2obj is able to emit a correct length for compilation units.
 
@@ -824,11 +824,11 @@
         - Attribute: DW_AT_name
           Form:      DW_FORM_strp
   debug_info:
-    - Version:    4
-      AbbrOffset: 0x00
-      AddrSize:   0x08
+    - Version:           4
+      DebugAbbrevOffset: 0x00
+      AddressSize:       0x08
       Entries:
-        - AbbrCode: 1
+        - AbbrevCode: 1
           Values:
             - Value: 0x00   ## DW_AT_producer [DW_FORM_strp]
             - Value: 0x0c   ## DW_LANG_C99, DW_AT_language [DW_FORM_data2]
@@ -837,7 +837,7 @@
             - Value: 0x1e   ## DW_AT_comp_dir [DW_FORM_strp]
             - Value: 0x1120 ## DW_AT_low_pc [DW_FORM_addr]
             - Value: 0x33   ## DW_AT_high_pc [DW_FORM_data4]
-        - AbbrCode: 2
+        - AbbrevCode: 2
           Values:
             - Value: 0x1120 ## DW_AT_low_pc [DW_FORM_addr]
             - Value: 0x06   ## DW_AT_high_pc [DW_FORM_data4]
Index: llvm/test/tools/llvm-objcopy/MachO/Inputs/strip-all-with-dwarf.yaml
===================================================================
--- llvm/test/tools/llvm-objcopy/MachO/Inputs/strip-all-with-dwarf.yaml
+++ llvm/test/tools/llvm-objcopy/MachO/Inputs/strip-all-with-dwarf.yaml
@@ -391,12 +391,12 @@
         - Attribute:       DW_AT_external
           Form:            DW_FORM_flag_present
   debug_info:
-    - Length:          113
-      Version:         4
-      AbbrOffset:      0
-      AddrSize:        8
+    - Length:            113
+      Version:           4
+      DebugAbbrevOffset: 0
+      AddressSize:       8
       Entries:
-        - AbbrCode:        0x00000001
+        - AbbrevCode: 0x00000001
           Values:
             - Value:           0x0000000000000000
             - Value:           0x000000000000000C
@@ -405,7 +405,7 @@
             - Value:           0x000000000000003B
             - Value:           0x0000000000000000
             - Value:           0x0000000000000024
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:
             - Value:           0x0000000000000064
             - Value:           0x000000000000003F
@@ -423,12 +423,12 @@
                 - 0x00
                 - 0x00
                 - 0x00
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:
             - Value:           0x0000000000000068
             - Value:           0x0000000000000005
             - Value:           0x0000000000000004
-        - AbbrCode:        0x00000004
+        - AbbrevCode: 0x00000004
           Values:
             - Value:           0x000000000000006C
             - Value:           0x000000000000003F
@@ -445,7 +445,7 @@
                 - 0x00
                 - 0x00
                 - 0x00
-        - AbbrCode:        0x00000005
+        - AbbrevCode: 0x00000005
           Values:
             - Value:           0x0000000000000000
             - Value:           0x0000000000000024
@@ -457,7 +457,7 @@
             - Value:           0x0000000000000003
             - Value:           0x000000000000003F
             - Value:           0x0000000000000001
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
   debug_line:
     - Length:          74
Index: llvm/test/tools/llvm-gsymutil/X86/mach-dwarf.yaml
===================================================================
--- llvm/test/tools/llvm-gsymutil/X86/mach-dwarf.yaml
+++ llvm/test/tools/llvm-gsymutil/X86/mach-dwarf.yaml
@@ -574,12 +574,12 @@
       - DieOffset:       0x000000D8
         Name:            char
   debug_info:
-    - Length:          220
-      Version:         4
-      AbbrOffset:      0
-      AddrSize:        8
+    - Length:            220
+      Version:           4
+      DebugAbbrevOffset: 0
+      AddressSize:       8
       Entries:
-        - AbbrCode:        0x00000001
+        - AbbrevCode: 0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000000004
@@ -589,21 +589,21 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000100000F70
             - Value:           0x0000000000000045
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:
             - Value:           0x0000000100000F70
             - Value:           0x0000000000000011
             - Value:           0x0000000000000001
               BlockData:       [ 0x56 ]
             - Value:           0x0000000000000046
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:
             - Value:           0x0000000000000002
               BlockData:       [ 0x91, 0x7C ]
             - Value:           0x0000000000000056
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
-        - AbbrCode:        0x00000004
+        - AbbrevCode: 0x00000004
           Values:
             - Value:           0x000000000000003F
             - Value:           0x0000000000000047
@@ -612,20 +612,20 @@
             - Value:           0x0000000000000062
             - Value:           0x0000000000000001
             - Value:           0x0000000000000001
-        - AbbrCode:        0x00000005
+        - AbbrevCode: 0x00000005
           Values:
             - Value:           0x000000000000004B
             - Value:           0x0000000000000001
             - Value:           0x0000000000000001
             - Value:           0x0000000000000062
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
-        - AbbrCode:        0x00000006
+        - AbbrevCode: 0x00000006
           Values:
             - Value:           0x000000000000004D
             - Value:           0x0000000000000005
             - Value:           0x0000000000000004
-        - AbbrCode:        0x00000007
+        - AbbrevCode: 0x00000007
           Values:
             - Value:           0x0000000100000F90
             - Value:           0x0000000000000025
@@ -636,7 +636,7 @@
             - Value:           0x0000000000000004
             - Value:           0x0000000000000062
             - Value:           0x0000000000000001
-        - AbbrCode:        0x00000008
+        - AbbrevCode: 0x00000008
           Values:
             - Value:           0x0000000000000002
               BlockData:       [ 0x91, 0x74 ]
@@ -644,7 +644,7 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000004
             - Value:           0x0000000000000062
-        - AbbrCode:        0x00000008
+        - AbbrevCode: 0x00000008
           Values:
             - Value:           0x0000000000000002
               BlockData:       [ 0x91, 0x68 ]
@@ -652,7 +652,7 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000004
             - Value:           0x00000000000000C9
-        - AbbrCode:        0x00000009
+        - AbbrevCode: 0x00000009
           Values:
             - Value:           0x0000000000000002
               BlockData:       [ 0x91, 0x64 ]
@@ -660,37 +660,37 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000005
             - Value:           0x0000000000000062
-        - AbbrCode:        0x0000000A
+        - AbbrevCode: 0x0000000A
           Values:
             - Value:           0x0000000000000046
             - Value:           0x0000000100000FAA
             - Value:           0x0000000000000006
             - Value:           0x0000000000000001
             - Value:           0x0000000000000005
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:
             - Value:           0x0000000000000002
               BlockData:       [ 0x91, 0x7C ]
             - Value:           0x0000000000000056
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
-        - AbbrCode:        0x0000000B
+        - AbbrevCode: 0x0000000B
           Values:
             - Value:           0x00000000000000CE
-        - AbbrCode:        0x0000000B
+        - AbbrevCode: 0x0000000B
           Values:
             - Value:           0x00000000000000D3
-        - AbbrCode:        0x0000000C
+        - AbbrevCode: 0x0000000C
           Values:
             - Value:           0x00000000000000D8
-        - AbbrCode:        0x00000006
+        - AbbrevCode: 0x00000006
           Values:
             - Value:           0x0000000000000060
             - Value:           0x0000000000000006
             - Value:           0x0000000000000001
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
   debug_line:
     - Length:          102
Index: llvm/test/tools/llvm-gsymutil/ARM_AArch64/fat-macho-dwarf.yaml
===================================================================
--- llvm/test/tools/llvm-gsymutil/ARM_AArch64/fat-macho-dwarf.yaml
+++ llvm/test/tools/llvm-gsymutil/ARM_AArch64/fat-macho-dwarf.yaml
@@ -407,12 +407,12 @@
           - DieOffset:       0x0000006F
             Name:            char
       debug_info:
-        - Length:          115
-          Version:         4
-          AbbrOffset:      0
-          AddrSize:        4
+        - Length:            115
+          Version:           4
+          DebugAbbrevOffset: 0
+          AddressSize:       4
           Entries:
-            - AbbrCode:        0x00000001
+            - AbbrevCode: 0x00000001
               Values:
                 - Value:           0x0000000000000001
                 - Value:           0x0000000000000004
@@ -422,7 +422,7 @@
                 - Value:           0x0000000000000001
                 - Value:           0x000000000000BFF0
                 - Value:           0x0000000000000010
-            - AbbrCode:        0x00000002
+            - AbbrevCode: 0x00000002
               Values:
                 - Value:           0x000000000000BFF0
                 - Value:           0x0000000000000010
@@ -434,7 +434,7 @@
                 - Value:           0x0000000000000059
                 - Value:           0x0000000000000001
                 - Value:           0x0000000000000001
-            - AbbrCode:        0x00000003
+            - AbbrevCode: 0x00000003
               Values:
                 - Value:           0x0000000000000002
                   BlockData:       [ 0x7D, 0x04 ]
@@ -442,7 +442,7 @@
                 - Value:           0x0000000000000001
                 - Value:           0x0000000000000001
                 - Value:           0x0000000000000059
-            - AbbrCode:        0x00000003
+            - AbbrevCode: 0x00000003
               Values:
                 - Value:           0x0000000000000002
                   BlockData:       [ 0x7D, 0x00 ]
@@ -450,28 +450,28 @@
                 - Value:           0x0000000000000001
                 - Value:           0x0000000000000001
                 - Value:           0x0000000000000060
-            - AbbrCode:        0x00000000
+            - AbbrevCode: 0x00000000
               Values:          []
-            - AbbrCode:        0x00000004
+            - AbbrevCode: 0x00000004
               Values:
                 - Value:           0x000000000000004E
                 - Value:           0x0000000000000005
                 - Value:           0x0000000000000004
-            - AbbrCode:        0x00000005
+            - AbbrevCode: 0x00000005
               Values:
                 - Value:           0x0000000000000065
-            - AbbrCode:        0x00000005
+            - AbbrevCode: 0x00000005
               Values:
                 - Value:           0x000000000000006A
-            - AbbrCode:        0x00000006
+            - AbbrevCode: 0x00000006
               Values:
                 - Value:           0x000000000000006F
-            - AbbrCode:        0x00000004
+            - AbbrevCode: 0x00000004
               Values:
                 - Value:           0x0000000000000052
                 - Value:           0x0000000000000006
                 - Value:           0x0000000000000001
-            - AbbrCode:        0x00000000
+            - AbbrevCode: 0x00000000
               Values:          []
       debug_line:
         - Length:          55
@@ -885,12 +885,12 @@
           - DieOffset:       0x00000076
             Name:            char
       debug_info:
-        - Length:          122
-          Version:         4
-          AbbrOffset:      0
-          AddrSize:        8
+        - Length:            122
+          Version:           4
+          DebugAbbrevOffset: 0
+          AddressSize:       8
           Entries:
-            - AbbrCode:        0x00000001
+            - AbbrevCode: 0x00000001
               Values:
                 - Value:           0x0000000000000001
                 - Value:           0x0000000000000004
@@ -900,7 +900,7 @@
                 - Value:           0x0000000000000001
                 - Value:           0x0000000100007F9C
                 - Value:           0x000000000000001C
-            - AbbrCode:        0x00000002
+            - AbbrevCode: 0x00000002
               Values:
                 - Value:           0x0000000100007F9C
                 - Value:           0x000000000000001C
@@ -911,7 +911,7 @@
                 - Value:           0x0000000000000001
                 - Value:           0x0000000000000060
                 - Value:           0x0000000000000001
-            - AbbrCode:        0x00000003
+            - AbbrevCode: 0x00000003
               Values:
                 - Value:           0x0000000000000002
                   BlockData:       [ 0x91, 0x08 ]
@@ -919,7 +919,7 @@
                 - Value:           0x0000000000000001
                 - Value:           0x0000000000000001
                 - Value:           0x0000000000000060
-            - AbbrCode:        0x00000003
+            - AbbrevCode: 0x00000003
               Values:
                 - Value:           0x0000000000000002
                   BlockData:       [ 0x91, 0x00 ]
@@ -927,28 +927,28 @@
                 - Value:           0x0000000000000001
                 - Value:           0x0000000000000001
                 - Value:           0x0000000000000067
-            - AbbrCode:        0x00000000
+            - AbbrevCode: 0x00000000
               Values:          []
-            - AbbrCode:        0x00000004
+            - AbbrevCode: 0x00000004
               Values:
                 - Value:           0x000000000000004E
                 - Value:           0x0000000000000005
                 - Value:           0x0000000000000004
-            - AbbrCode:        0x00000005
+            - AbbrevCode: 0x00000005
               Values:
                 - Value:           0x000000000000006C
-            - AbbrCode:        0x00000005
+            - AbbrevCode: 0x00000005
               Values:
                 - Value:           0x0000000000000071
-            - AbbrCode:        0x00000006
+            - AbbrevCode: 0x00000006
               Values:
                 - Value:           0x0000000000000076
-            - AbbrCode:        0x00000004
+            - AbbrevCode: 0x00000004
               Values:
                 - Value:           0x0000000000000052
                 - Value:           0x0000000000000006
                 - Value:           0x0000000000000001
-            - AbbrCode:        0x00000000
+            - AbbrevCode: 0x00000000
               Values:          []
       debug_line:
         - Length:          59
Index: llvm/test/tools/llvm-dwarfdump/X86/verify_overlapping_cu_ranges.yaml
===================================================================
--- llvm/test/tools/llvm-dwarfdump/X86/verify_overlapping_cu_ranges.yaml
+++ llvm/test/tools/llvm-dwarfdump/X86/verify_overlapping_cu_ranges.yaml
@@ -223,37 +223,37 @@
         - LowOffset:       0x0000000000001000
           HighOffset:      0x0000000000002000
   debug_info:
-    - Length:          99
-      Version:         4
-      AbbrOffset:      0
-      AddrSize:        8
+    - Length:            99
+      Version:           4
+      DebugAbbrevOffset: 0
+      AddressSize:       8
       Entries:
-        - AbbrCode:        0x00000001
+        - AbbrevCode: 0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000000002
             - Value:           0x0000000000000000
             - Value:           0x0000000000000000
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:
             - Value:           0x000000000000000D
             - Value:           0x0000000000000000
             - Value:           0x0000000000000020
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:
             - Value:           0x0000000000000017
             - Value:           0x0000000000000000
             - Value:           0x0000000000000030
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:
             - Value:           0x0000000000000021
             - Value:           0x0000000000001000
             - Value:           0x0000000000001000
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:
             - Value:           0x0000000000000026
             - Value:           0x0000000000002000
             - Value:           0x0000000000001000
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
 ...
Index: llvm/test/ObjectYAML/MachO/DWARF5-debug_info.yaml
===================================================================
--- llvm/test/ObjectYAML/MachO/DWARF5-debug_info.yaml
+++ llvm/test/ObjectYAML/MachO/DWARF5-debug_info.yaml
@@ -390,13 +390,13 @@
         - Address:         0x0000000100000F50
           Length:          52
   debug_info:      
-    - Length:          118
-      Version:         5
-      UnitType:        DW_UT_compile
-      AbbrOffset:      0
-      AddrSize:        8
+    - Length:            118
+      Version:           5
+      UnitType:          DW_UT_compile
+      DebugAbbrevOffset: 0
+      AddressSize:       8
       Entries:         
-        - AbbrCode:        0x00000001
+        - AbbrevCode: 0x00000001
           Values:          
             - Value:           0x0000000000000001
             - Value:           0x000000000000000C
@@ -405,7 +405,7 @@
             - Value:           0x0000000000000046
             - Value:           0x0000000100000F50
             - Value:           0x0000000000000034
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:          
             - Value:           0x0000000100000F50
             - Value:           0x0000000000000034
@@ -418,7 +418,7 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000060
             - Value:           0x0000000000000001
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
@@ -428,7 +428,7 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000003
             - Value:           0x0000000000000060
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
@@ -438,25 +438,25 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000003
             - Value:           0x0000000000000067
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          
-        - AbbrCode:        0x00000004
+        - AbbrevCode: 0x00000004
           Values:          
             - Value:           0x0000000000000085
             - Value:           0x0000000000000005
             - Value:           0x0000000000000004
-        - AbbrCode:        0x00000005
+        - AbbrevCode: 0x00000005
           Values:          
             - Value:           0x000000000000006C
-        - AbbrCode:        0x00000005
+        - AbbrevCode: 0x00000005
           Values:          
             - Value:           0x0000000000000071
-        - AbbrCode:        0x00000004
+        - AbbrevCode: 0x00000004
           Values:          
             - Value:           0x0000000000000089
             - Value:           0x0000000000000006
             - Value:           0x0000000000000001
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          
   debug_line:      
     - Length:          65
@@ -513,13 +513,13 @@
 
 #      DWARF32: DWARF:
 #      DWARF32:   debug_info:
-# DWARF32-NEXT:     - Length:     0x0000000000000076
-# DWARF32-NEXT:       Version:    5
-# DWARF32-NEXT:       UnitType:   DW_UT_compile
-# DWARF32-NEXT:       AbbrOffset: 0
-# DWARF32-NEXT:       AddrSize:   8
+# DWARF32-NEXT:     - Length:            0x0000000000000076
+# DWARF32-NEXT:       Version:           5
+# DWARF32-NEXT:       UnitType:          DW_UT_compile
+# DWARF32-NEXT:       DebugAbbrevOffset: 0
+# DWARF32-NEXT:       AddressSize:       8
 # DWARF32-NEXT:       Entries:
-# DWARF32-NEXT:         - AbbrCode: 0x00000001
+# DWARF32-NEXT:         - AbbrevCode: 0x00000001
 # DWARF32-NEXT:           Values:
 # DWARF32-NEXT:             - Value: 0x0000000000000001
 # DWARF32-NEXT:             - Value: 0x000000000000000C
@@ -528,7 +528,7 @@
 # DWARF32-NEXT:             - Value: 0x0000000000000046
 # DWARF32-NEXT:             - Value: 0x0000000100000F50
 # DWARF32-NEXT:             - Value: 0x0000000000000034
-# DWARF32-NEXT:         - AbbrCode: 0x00000002
+# DWARF32-NEXT:         - AbbrevCode: 0x00000002
 # DWARF32-NEXT:           Values:
 # DWARF32-NEXT:             - Value: 0x0000000100000F50
 # DWARF32-NEXT:             - Value: 0x0000000000000034
@@ -540,7 +540,7 @@
 # DWARF32-NEXT:             - Value: 0x0000000000000001
 # DWARF32-NEXT:             - Value: 0x0000000000000060
 # DWARF32-NEXT:             - Value: 0x0000000000000001
-# DWARF32-NEXT:         - AbbrCode: 0x00000003
+# DWARF32-NEXT:         - AbbrevCode: 0x00000003
 # DWARF32-NEXT:           Values:
 # DWARF32-NEXT:             - Value: 0x0000000000000002
 # DWARF32-NEXT:               BlockData: [ 0x91, 0x78 ]
@@ -548,7 +548,7 @@
 # DWARF32-NEXT:             - Value: 0x0000000000000001
 # DWARF32-NEXT:             - Value: 0x0000000000000003
 # DWARF32-NEXT:             - Value: 0x0000000000000060
-# DWARF32-NEXT:         - AbbrCode:        0x00000003
+# DWARF32-NEXT:         - AbbrevCode: 0x00000003
 # DWARF32-NEXT:           Values:          
 # DWARF32-NEXT:             - Value:           0x0000000000000002
 # DWARF32-NEXT:               BlockData:       [ 0x91, 0x70 ]
@@ -556,25 +556,25 @@
 # DWARF32-NEXT:             - Value:           0x0000000000000001
 # DWARF32-NEXT:             - Value:           0x0000000000000003
 # DWARF32-NEXT:             - Value:           0x0000000000000067
-# DWARF32-NEXT:         - AbbrCode:        0x00000000
+# DWARF32-NEXT:         - AbbrevCode: 0x00000000
 # DWARF32-NEXT:           Values:          
-# DWARF32-NEXT:         - AbbrCode:        0x00000004
+# DWARF32-NEXT:         - AbbrevCode: 0x00000004
 # DWARF32-NEXT:           Values:          
 # DWARF32-NEXT:             - Value:           0x0000000000000085
 # DWARF32-NEXT:             - Value:           0x0000000000000005
 # DWARF32-NEXT:             - Value:           0x0000000000000004
-# DWARF32-NEXT:         - AbbrCode:        0x00000005
+# DWARF32-NEXT:         - AbbrevCode: 0x00000005
 # DWARF32-NEXT:           Values:          
 # DWARF32-NEXT:             - Value:           0x000000000000006C
-# DWARF32-NEXT:         - AbbrCode:        0x00000005
+# DWARF32-NEXT:         - AbbrevCode: 0x00000005
 # DWARF32-NEXT:           Values:          
 # DWARF32-NEXT:             - Value:           0x0000000000000071
-# DWARF32-NEXT:         - AbbrCode:        0x00000004
+# DWARF32-NEXT:         - AbbrevCode: 0x00000004
 # DWARF32-NEXT:           Values:          
 # DWARF32-NEXT:             - Value:           0x0000000000000089
 # DWARF32-NEXT:             - Value:           0x0000000000000006
 # DWARF32-NEXT:             - Value:           0x0000000000000001
-# DWARF32-NEXT:         - AbbrCode:        0x00000000
+# DWARF32-NEXT:         - AbbrevCode: 0x00000000
 # DWARF32-NEXT:           Values:          
 
 ## b) Test that yaml2obj emits a correct unit header and obj2yaml is able to convert it back.
@@ -585,13 +585,13 @@
 # RUN:   obj2yaml | FileCheck %s --check-prefix=DWARF32-YAML
 
 #      DWARF32-YAML: debug_info:
-# DWARF32-YAML-NEXT:   - Length:     0x000000000000000C
-# 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:   - Length:            0x000000000000000C
+# DWARF32-YAML-NEXT:     Version:           5
+# DWARF32-YAML-NEXT:     UnitType:          DW_UT_compile
+# DWARF32-YAML-NEXT:     DebugAbbrevOffset: 0x0000000000000000
+# DWARF32-YAML-NEXT:     AddressSize:       8
 # DWARF32-YAML-NEXT:     Entries:
-# DWARF32-YAML-NEXT:       - AbbrCode: 0x00000001
+# DWARF32-YAML-NEXT:       - AbbrevCode: 0x00000001
 # DWARF32-YAML-NEXT:         Values:
 # DWARF32-YAML-NEXT:           - Value: 0x0000000000001234
 
@@ -651,14 +651,14 @@
         - Attribute: DW_AT_low_pc
           Form:      DW_FORM_addr
   debug_info:
-    - Format:     [[FORMAT]]
-      Length:     [[LENGTH]]
-      Version:    5
-      UnitType:   DW_UT_compile
-      AbbrOffset: 0
-      AddrSize:   8
+    - Format:            [[FORMAT]]
+      Length:            [[LENGTH]]
+      Version:           5
+      UnitType:          DW_UT_compile
+      DebugAbbrevOffset: 0
+      AddressSize:       8
       Entries:
-        - AbbrCode: 1
+        - AbbrevCode: 1
           Values:
             - Value: 0x1234
 
@@ -668,13 +668,13 @@
 # RUN:   obj2yaml | FileCheck %s --check-prefix=DWARF64-YAML
 
 #      DWARF64-YAML: debug_info:
-# DWARF64-YAML-NEXT:   - Format:     DWARF64
-# DWARF64-YAML-NEXT:     Length:     0x0000000000000014
-# DWARF64-YAML-NEXT:     Version:    5
-# DWARF64-YAML-NEXT:     UnitType:   DW_UT_compile
-# DWARF64-YAML-NEXT:     AbbrOffset: 0x0000000000000000
-# DWARF64-YAML-NEXT:     AddrSize:   8
+# DWARF64-YAML-NEXT:   - Format:            DWARF64
+# DWARF64-YAML-NEXT:     Length:            0x0000000000000014
+# DWARF64-YAML-NEXT:     Version:           5
+# DWARF64-YAML-NEXT:     UnitType:          DW_UT_compile
+# DWARF64-YAML-NEXT:     DebugAbbrevOffset: 0x0000000000000000
+# DWARF64-YAML-NEXT:     AddressSize:       8
 # DWARF64-YAML-NEXT:     Entries:
-# DWARF64-YAML-NEXT:       - AbbrCode: 0x00000001
+# DWARF64-YAML-NEXT:       - AbbrevCode: 0x00000001
 # DWARF64-YAML-NEXT:         Values:
 # DWARF64-YAML-NEXT:           - Value: 0x0000000000001234
Index: llvm/test/ObjectYAML/MachO/DWARF2-AddrSize8-FormValues.yaml
===================================================================
--- llvm/test/ObjectYAML/MachO/DWARF2-AddrSize8-FormValues.yaml
+++ llvm/test/ObjectYAML/MachO/DWARF2-AddrSize8-FormValues.yaml
@@ -334,12 +334,12 @@
         - Attribute:       0x201A
           Form:            DW_FORM_addr
   debug_info:      
-    - Length:          168
-      Version:         2
-      AbbrOffset:      0
-      AddrSize:        8
+    - Length:            168
+      Version:           2
+      DebugAbbrevOffset: 0
+      AddressSize:       8
       Entries:         
-        - AbbrCode:        0x00000001
+        - AbbrevCode: 0x00000001
           Values:          
             - Value:           0x0123456789ABCDEF
             - Value:           0x000000000000000A
@@ -415,12 +415,12 @@
 ...
 
 #CHECK:   debug_info:      
-#CHECK:     - Length:          0x00000000000000A8
-#CHECK:       Version:         2
-#CHECK:       AbbrOffset:      0
-#CHECK:       AddrSize:        8
+#CHECK:     - Length:            0x00000000000000A8
+#CHECK:       Version:           2
+#CHECK:       DebugAbbrevOffset: 0
+#CHECK:       AddressSize:       8
 #CHECK:       Entries:         
-#CHECK:         - AbbrCode:        0x00000001
+#CHECK:         - AbbrevCode: 0x00000001
 #CHECK:           Values:          
 #CHECK:             - Value:           0x0123456789ABCDEF
 #CHECK:             - Value:           0x000000000000000A
Index: llvm/test/ObjectYAML/MachO/DWARF-debug_ranges.yaml
===================================================================
--- llvm/test/ObjectYAML/MachO/DWARF-debug_ranges.yaml
+++ llvm/test/ObjectYAML/MachO/DWARF-debug_ranges.yaml
@@ -213,32 +213,32 @@
         - LowOffset:       0x0000000000000000
           HighOffset:      0x0000000000001000
   debug_info:
-    - Length:          82
-      Version:         4
-      AbbrOffset:      0
-      AddrSize:        8
+    - Length:            82
+      Version:           4
+      DebugAbbrevOffset: 0
+      AddressSize:       8
       Entries:
-        - AbbrCode:        0x00000001
+        - AbbrevCode: 0x00000001
           Values:
             - Value:           0x0000000000000001
             - Value:           0x0000000000000004
             - Value:           0x0000000000000000
             - Value:           0x0000000000000000
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:
             - Value:           0x000000000000000D
             - Value:           0x0000000000000000
             - Value:           0x0000000000000020
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:
             - Value:           0x0000000000000017
             - Value:           0x0000000000000000
             - Value:           0x0000000000000030
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:
             - Value:           0x0000000000000021
             - Value:           0x0000000000001000
             - Value:           0x0000000000001000
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
 ...
Index: llvm/test/ObjectYAML/MachO/DWARF-debug_line.yaml
===================================================================
--- llvm/test/ObjectYAML/MachO/DWARF-debug_line.yaml
+++ llvm/test/ObjectYAML/MachO/DWARF-debug_line.yaml
@@ -423,12 +423,12 @@
       - DieOffset:       0x00000071
         Name:            char
   debug_info:      
-    - Length:          117
-      Version:         4
-      AbbrOffset:      0
-      AddrSize:        8
+    - Length:            117
+      Version:           4
+      DebugAbbrevOffset: 0
+      AddressSize:       8
       Entries:         
-        - AbbrCode:        0x00000001
+        - AbbrevCode: 0x00000001
           Values:          
             - Value:           0x0000000000000001
             - Value:           0x000000000000000C
@@ -437,7 +437,7 @@
             - Value:           0x0000000000000046
             - Value:           0x0000000100000F50
             - Value:           0x0000000000000034
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:          
             - Value:           0x0000000100000F50
             - Value:           0x0000000000000034
@@ -450,7 +450,7 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000060
             - Value:           0x0000000000000001
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
@@ -460,7 +460,7 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000003
             - Value:           0x0000000000000060
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
@@ -470,25 +470,25 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000003
             - Value:           0x0000000000000067
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          
-        - AbbrCode:        0x00000004
+        - AbbrevCode: 0x00000004
           Values:          
             - Value:           0x0000000000000085
             - Value:           0x0000000000000005
             - Value:           0x0000000000000004
-        - AbbrCode:        0x00000005
+        - AbbrevCode: 0x00000005
           Values:          
             - Value:           0x000000000000006C
-        - AbbrCode:        0x00000005
+        - AbbrevCode: 0x00000005
           Values:          
             - Value:           0x0000000000000071
-        - AbbrCode:        0x00000004
+        - AbbrevCode: 0x00000004
           Values:          
             - Value:           0x0000000000000089
             - Value:           0x0000000000000006
             - Value:           0x0000000000000001
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          
   debug_line:      
     - Length:          65
Index: llvm/test/ObjectYAML/MachO/DWARF-debug_info.yaml
===================================================================
--- llvm/test/ObjectYAML/MachO/DWARF-debug_info.yaml
+++ llvm/test/ObjectYAML/MachO/DWARF-debug_info.yaml
@@ -390,12 +390,12 @@
         - Address:         0x0000000100000F50
           Length:          52
   debug_info:      
-    - Length:          117
-      Version:         4
-      AbbrOffset:      0
-      AddrSize:        8
+    - Length:            117
+      Version:           4
+      DebugAbbrevOffset: 0
+      AddressSize:       8
       Entries:         
-        - AbbrCode:        0x00000001
+        - AbbrevCode: 0x00000001
           Values:          
             - Value:           0x0000000000000001
             - Value:           0x000000000000000C
@@ -404,7 +404,7 @@
             - Value:           0x0000000000000046
             - Value:           0x0000000100000F50
             - Value:           0x0000000000000034
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:          
             - Value:           0x0000000100000F50
             - Value:           0x0000000000000034
@@ -417,7 +417,7 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000060
             - Value:           0x0000000000000001
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
@@ -427,7 +427,7 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000003
             - Value:           0x0000000000000060
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
@@ -437,25 +437,25 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000003
             - Value:           0x0000000000000067
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          
-        - AbbrCode:        0x00000004
+        - AbbrevCode: 0x00000004
           Values:          
             - Value:           0x0000000000000085
             - Value:           0x0000000000000005
             - Value:           0x0000000000000004
-        - AbbrCode:        0x00000005
+        - AbbrevCode: 0x00000005
           Values:          
             - Value:           0x000000000000006C
-        - AbbrCode:        0x00000005
+        - AbbrevCode: 0x00000005
           Values:          
             - Value:           0x0000000000000071
-        - AbbrCode:        0x00000004
+        - AbbrevCode: 0x00000004
           Values:          
             - Value:           0x0000000000000089
             - Value:           0x0000000000000006
             - Value:           0x0000000000000001
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          
   debug_line:      
     - Length:          65
@@ -513,12 +513,12 @@
 
 #      DWARF32: DWARF:
 #      DWARF32:   debug_info:
-# DWARF32-NEXT:     - Length:     0x0000000000000075
-# DWARF32-NEXT:       Version:    4
-# DWARF32-NEXT:       AbbrOffset: 0
-# DWARF32-NEXT:       AddrSize:   8
+# DWARF32-NEXT:     - Length:            0x0000000000000075
+# DWARF32-NEXT:       Version:           4
+# DWARF32-NEXT:       DebugAbbrevOffset: 0
+# DWARF32-NEXT:       AddressSize:       8
 # DWARF32-NEXT:       Entries:
-# DWARF32-NEXT:         - AbbrCode: 0x00000001
+# DWARF32-NEXT:         - AbbrevCode: 0x00000001
 # DWARF32-NEXT:           Values:
 # DWARF32-NEXT:             - Value: 0x0000000000000001
 # DWARF32-NEXT:             - Value: 0x000000000000000C
@@ -527,7 +527,7 @@
 # DWARF32-NEXT:             - Value: 0x0000000000000046
 # DWARF32-NEXT:             - Value: 0x0000000100000F50
 # DWARF32-NEXT:             - Value: 0x0000000000000034
-# DWARF32-NEXT:         - AbbrCode: 0x00000002
+# DWARF32-NEXT:         - AbbrevCode: 0x00000002
 # DWARF32-NEXT:           Values:
 # DWARF32-NEXT:             - Value: 0x0000000100000F50
 # DWARF32-NEXT:             - Value: 0x0000000000000034
@@ -539,7 +539,7 @@
 # DWARF32-NEXT:             - Value: 0x0000000000000001
 # DWARF32-NEXT:             - Value: 0x0000000000000060
 # DWARF32-NEXT:             - Value: 0x0000000000000001
-# DWARF32-NEXT:         - AbbrCode:        0x00000003
+# DWARF32-NEXT:         - AbbrevCode: 0x00000003
 # DWARF32-NEXT:           Values:
 # DWARF32-NEXT:             - Value: 0x0000000000000002
 # DWARF32-NEXT:               BlockData: [ 0x91, 0x78 ]
@@ -547,7 +547,7 @@
 # DWARF32-NEXT:             - Value: 0x0000000000000001
 # DWARF32-NEXT:             - Value: 0x0000000000000003
 # DWARF32-NEXT:             - Value: 0x0000000000000060
-# DWARF32-NEXT:         - AbbrCode: 0x00000003
+# DWARF32-NEXT:         - AbbrevCode: 0x00000003
 # DWARF32-NEXT:           Values:
 # DWARF32-NEXT:             - Value: 0x0000000000000002
 # DWARF32-NEXT:               BlockData: [ 0x91, 0x70 ]
@@ -555,25 +555,25 @@
 # DWARF32-NEXT:             - Value: 0x0000000000000001
 # DWARF32-NEXT:             - Value: 0x0000000000000003
 # DWARF32-NEXT:             - Value: 0x0000000000000067
-# DWARF32-NEXT:         - AbbrCode: 0x00000000
+# DWARF32-NEXT:         - AbbrevCode: 0x00000000
 # DWARF32-NEXT:           Values:
-# DWARF32-NEXT:         - AbbrCode: 0x00000004
+# DWARF32-NEXT:         - AbbrevCode: 0x00000004
 # DWARF32-NEXT:           Values:
 # DWARF32-NEXT:             - Value: 0x0000000000000085
 # DWARF32-NEXT:             - Value: 0x0000000000000005
 # DWARF32-NEXT:             - Value: 0x0000000000000004
-# DWARF32-NEXT:         - AbbrCode: 0x00000005
+# DWARF32-NEXT:         - AbbrevCode: 0x00000005
 # DWARF32-NEXT:           Values:
 # DWARF32-NEXT:             - Value: 0x000000000000006C
-# DWARF32-NEXT:         - AbbrCode: 0x00000005
+# DWARF32-NEXT:         - AbbrevCode: 0x00000005
 # DWARF32-NEXT:           Values:
 # DWARF32-NEXT:             - Value: 0x0000000000000071
-# DWARF32-NEXT:         - AbbrCode: 0x00000004
+# DWARF32-NEXT:         - AbbrevCode: 0x00000004
 # DWARF32-NEXT:           Values:
 # DWARF32-NEXT:             - Value: 0x0000000000000089
 # DWARF32-NEXT:             - Value: 0x0000000000000006
 # DWARF32-NEXT:             - Value: 0x0000000000000001
-# DWARF32-NEXT:         - AbbrCode: 0x00000000
+# DWARF32-NEXT:         - AbbrevCode: 0x00000000
 # DWARF32-NEXT:           Values:
 
 ## b) Test that yaml2obj emits a correct unit header and obj2yaml is able to convert it back.
@@ -584,12 +584,12 @@
 # RUN:   obj2yaml | FileCheck %s --check-prefix=DWARF32-YAML
 
 #      DWARF32-YAML: debug_info:
-# DWARF32-YAML-NEXT:   - Length:     0x000000000000000C
-# DWARF32-YAML-NEXT:     Version:    4
-# DWARF32-YAML-NEXT:     AbbrOffset: 0
-# DWARF32-YAML-NEXT:     AddrSize:   8
+# DWARF32-YAML-NEXT:   - Length:            0x000000000000000C
+# DWARF32-YAML-NEXT:     Version:           4
+# DWARF32-YAML-NEXT:     DebugAbbrevOffset: 0
+# DWARF32-YAML-NEXT:     AddressSize:       8
 # DWARF32-YAML-NEXT:     Entries:
-# DWARF32-YAML-NEXT:       - AbbrCode: 0x00000001
+# DWARF32-YAML-NEXT:       - AbbrevCode: 0x00000001
 # DWARF32-YAML-NEXT:         Values:
 # DWARF32-YAML-NEXT:           - Value: 0x0000000000001234
 
@@ -649,13 +649,13 @@
         - Attribute: DW_AT_low_pc
           Form:      DW_FORM_addr
   debug_info:
-    - Format:     [[FORMAT]]
-      Length:     12
-      Version:    4
-      AbbrOffset: 0
-      AddrSize:   8
+    - Format:            [[FORMAT]]
+      Length:            12
+      Version:           4
+      DebugAbbrevOffset: 0
+      AddressSize:       8
       Entries:
-        - AbbrCode: 1
+        - AbbrevCode: 1
           Values:
             - Value: 0x1234
 
@@ -665,12 +665,12 @@
 # RUN:   obj2yaml | FileCheck %s --check-prefix=DWARF64-YAML
 
 #      DWARF64-YAML: debug_info:
-# DWARF64-YAML-NEXT:   - Format:     DWARF64
-# DWARF64-YAML-NEXT:     Length:     0x000000000000000C
-# DWARF64-YAML-NEXT:     Version:    4
-# DWARF64-YAML-NEXT:     AbbrOffset: 0
-# DWARF64-YAML-NEXT:     AddrSize:   8
+# DWARF64-YAML-NEXT:   - Format:            DWARF64
+# DWARF64-YAML-NEXT:     Length:            0x000000000000000C
+# DWARF64-YAML-NEXT:     Version:           4
+# DWARF64-YAML-NEXT:     DebugAbbrevOffset: 0
+# DWARF64-YAML-NEXT:     AddressSize:       8
 # DWARF64-YAML-NEXT:     Entries:
-# DWARF64-YAML-NEXT:       - AbbrCode: 0x00000001
+# DWARF64-YAML-NEXT:       - AbbrevCode: 0x00000001
 # DWARF64-YAML-NEXT:         Values:
 # DWARF64-YAML-NEXT:           - Value: 0x0000000000001234
Index: llvm/lib/ObjectYAML/DWARFYAML.cpp
===================================================================
--- llvm/lib/ObjectYAML/DWARFYAML.cpp
+++ llvm/lib/ObjectYAML/DWARFYAML.cpp
@@ -149,13 +149,13 @@
   IO.mapRequired("Version", Unit.FormParams.Version);
   if (Unit.FormParams.Version >= 5)
     IO.mapRequired("UnitType", Unit.Type);
-  IO.mapRequired("AbbrOffset", Unit.AbbrOffset);
-  IO.mapRequired("AddrSize", Unit.FormParams.AddrSize);
+  IO.mapRequired("DebugAbbrevOffset", Unit.AbbrOffset);
+  IO.mapRequired("AddressSize", Unit.FormParams.AddrSize);
   IO.mapOptional("Entries", Unit.Entries);
 }
 
 void MappingTraits<DWARFYAML::Entry>::mapping(IO &IO, DWARFYAML::Entry &Entry) {
-  IO.mapRequired("AbbrCode", Entry.AbbrCode);
+  IO.mapRequired("AbbrevCode", Entry.AbbrCode);
   IO.mapRequired("Values", Entry.Values);
 }
 
Index: lldb/unittests/SymbolFile/DWARF/XcodeSDKModuleTests.cpp
===================================================================
--- lldb/unittests/SymbolFile/DWARF/XcodeSDKModuleTests.cpp
+++ lldb/unittests/SymbolFile/DWARF/XcodeSDKModuleTests.cpp
@@ -47,16 +47,16 @@
       - Attribute:       DW_AT_APPLE_sdk
         Form:            DW_FORM_strp
 debug_info:
-  - Length:          8
-    Version:         2
-    AbbrOffset:      0
-    AddrSize:        8
+  - Length:            8
+    Version:           2
+    DebugAbbrevOffset: 0
+    AddressSize:        8
     Entries:
-      - AbbrCode:        0x00000001
+      - AbbrevCode: 0x00000001
         Values:
           - Value:           0x000000000000000C
           - Value:           0x0000000000000000
-      - AbbrCode:        0x00000000
+      - AbbrevCode: 0x00000000
         Values:          []
 ...
 )";
Index: lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp
===================================================================
--- lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp
+++ lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp
@@ -56,35 +56,35 @@
       "      - Attribute:       DW_AT_byte_size\n"
       "        Form:            DW_FORM_data1\n"
       "debug_info:\n"
-      "  - Version:         4\n"
-      "    AbbrOffset:      0\n"
-      "    AddrSize:        8\n"
+      "  - Version:           4\n"
+      "    DebugAbbrevOffset: 0\n"
+      "    AddressSize:       8\n"
       "    Entries:\n"
-      "      - AbbrCode:        0x00000001\n"
+      "      - AbbrevCode: 0x00000001\n"
       "        Values:\n"
       "          - Value:           0x000000000000000C\n"
       // 0x0000000e:
-      "      - AbbrCode:        0x00000002\n"
+      "      - AbbrevCode: 0x00000002\n"
       "        Values:\n"
       "          - Value:           0x0000000000000007\n" // DW_ATE_unsigned
       "          - Value:           0x0000000000000004\n"
       // 0x00000011:
-      "      - AbbrCode:        0x00000002\n"
+      "      - AbbrevCode: 0x00000002\n"
       "        Values:\n"
       "          - Value:           0x0000000000000007\n" // DW_ATE_unsigned
       "          - Value:           0x0000000000000008\n"
       // 0x00000014:
-      "      - AbbrCode:        0x00000002\n"
+      "      - AbbrevCode: 0x00000002\n"
       "        Values:\n"
       "          - Value:           0x0000000000000005\n" // DW_ATE_signed
       "          - Value:           0x0000000000000008\n"
       // 0x00000017:
-      "      - AbbrCode:        0x00000002\n"
+      "      - AbbrevCode: 0x00000002\n"
       "        Values:\n"
       "          - Value:           0x0000000000000008\n" // DW_ATE_unsigned_char
       "          - Value:           0x0000000000000001\n"
       ""
-      "      - AbbrCode:        0x00000000\n"
+      "      - AbbrevCode: 0x00000000\n"
       "        Values:          []\n";
 
   YAMLModuleTester t(yamldata, "i386-unknown-linux");
Index: lldb/unittests/Symbol/Inputs/inlined-functions.yaml
===================================================================
--- lldb/unittests/Symbol/Inputs/inlined-functions.yaml
+++ lldb/unittests/Symbol/Inputs/inlined-functions.yaml
@@ -342,12 +342,12 @@
         - Attribute:       DW_AT_type
           Form:            DW_FORM_ref4
   debug_info:      
-    - Length:          579
-      Version:         4
-      AbbrOffset:      0
-      AddrSize:        8
+    - Length:            579
+      Version:           4
+      DebugAbbrevOffset: 0
+      AddressSize:       8
       Entries:         
-        - AbbrCode:        0x00000001
+        - AbbrevCode: 0x00000001
           Values:          
             - Value:           0x0000000000000000
             - Value:           0x0000000000000004
@@ -356,7 +356,7 @@
             - Value:           0x0000000000000044
             - Value:           0x0000000000000000
             - Value:           0x00000000000000E0
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:          
             - Value:           0x0000000000000000
             - Value:           0x000000000000001E
@@ -369,7 +369,7 @@
             - Value:           0x0000000000000006
             - Value:           0x00000000000000B2
             - Value:           0x0000000000000001
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
@@ -379,7 +379,7 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000006
             - Value:           0x00000000000000B2
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
@@ -389,7 +389,7 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000006
             - Value:           0x00000000000000B2
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
@@ -399,7 +399,7 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000006
             - Value:           0x00000000000000B2
-        - AbbrCode:        0x00000004
+        - AbbrevCode: 0x00000004
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
@@ -409,9 +409,9 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000007
             - Value:           0x00000000000000B2
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
-        - AbbrCode:        0x00000005
+        - AbbrevCode: 0x00000005
           Values:          
             - Value:           0x0000000000000094
             - Value:           0x000000000000009E
@@ -420,32 +420,32 @@
             - Value:           0x00000000000000B2
             - Value:           0x0000000000000001
             - Value:           0x0000000000000001
-        - AbbrCode:        0x00000006
+        - AbbrevCode: 0x00000006
           Values:          
             - Value:           0x00000000000000A7
             - Value:           0x0000000000000001
             - Value:           0x0000000000000001
             - Value:           0x00000000000000B2
-        - AbbrCode:        0x00000006
+        - AbbrevCode: 0x00000006
           Values:          
             - Value:           0x00000000000000A9
             - Value:           0x0000000000000001
             - Value:           0x0000000000000001
             - Value:           0x00000000000000B2
-        - AbbrCode:        0x00000007
+        - AbbrevCode: 0x00000007
           Values:          
             - Value:           0x00000000000000AB
             - Value:           0x0000000000000001
             - Value:           0x0000000000000002
             - Value:           0x00000000000000B2
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
-        - AbbrCode:        0x00000008
+        - AbbrevCode: 0x00000008
           Values:          
             - Value:           0x00000000000000A3
             - Value:           0x0000000000000005
             - Value:           0x0000000000000004
-        - AbbrCode:        0x00000005
+        - AbbrevCode: 0x00000005
           Values:          
             - Value:           0x00000000000000B2
             - Value:           0x00000000000000BE
@@ -454,39 +454,39 @@
             - Value:           0x00000000000000B2
             - Value:           0x0000000000000001
             - Value:           0x0000000000000001
-        - AbbrCode:        0x00000006
+        - AbbrevCode: 0x00000006
           Values:          
             - Value:           0x00000000000000A7
             - Value:           0x0000000000000001
             - Value:           0x000000000000000B
             - Value:           0x00000000000000B2
-        - AbbrCode:        0x00000006
+        - AbbrevCode: 0x00000006
           Values:          
             - Value:           0x00000000000000A9
             - Value:           0x0000000000000001
             - Value:           0x000000000000000B
             - Value:           0x00000000000000B2
-        - AbbrCode:        0x00000006
+        - AbbrevCode: 0x00000006
           Values:          
             - Value:           0x00000000000000C3
             - Value:           0x0000000000000001
             - Value:           0x000000000000000B
             - Value:           0x00000000000000B2
-        - AbbrCode:        0x00000006
+        - AbbrevCode: 0x00000006
           Values:          
             - Value:           0x00000000000000C5
             - Value:           0x0000000000000001
             - Value:           0x000000000000000B
             - Value:           0x00000000000000B2
-        - AbbrCode:        0x00000007
+        - AbbrevCode: 0x00000007
           Values:          
             - Value:           0x00000000000000AB
             - Value:           0x0000000000000001
             - Value:           0x000000000000000C
             - Value:           0x00000000000000B2
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
-        - AbbrCode:        0x00000009
+        - AbbrevCode: 0x00000009
           Values:          
             - Value:           0x0000000000000020
             - Value:           0x00000000000000C0
@@ -498,7 +498,7 @@
             - Value:           0x0000000000000011
             - Value:           0x00000000000000B2
             - Value:           0x0000000000000001
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:          
             - Value:           0x0000000000000003
               BlockData:       
@@ -509,7 +509,7 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000011
             - Value:           0x00000000000000B2
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:          
             - Value:           0x0000000000000003
               BlockData:       
@@ -520,7 +520,7 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000011
             - Value:           0x0000000000000235
-        - AbbrCode:        0x00000004
+        - AbbrevCode: 0x00000004
           Values:          
             - Value:           0x0000000000000003
               BlockData:       
@@ -531,28 +531,28 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000013
             - Value:           0x00000000000000B2
-        - AbbrCode:        0x0000000A
+        - AbbrevCode: 0x0000000A
           Values:          
             - Value:           0x0000000000000080
             - Value:           0x000000000000005A
             - Value:           0x0000000000000025
             - Value:           0x0000000000000001
             - Value:           0x0000000000000012
-        - AbbrCode:        0x0000000B
+        - AbbrevCode: 0x0000000B
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
                 - 0x91
                 - 0x44
             - Value:           0x0000000000000090
-        - AbbrCode:        0x0000000B
+        - AbbrevCode: 0x0000000B
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
                 - 0x91
                 - 0x40
             - Value:           0x000000000000009B
-        - AbbrCode:        0x0000000C
+        - AbbrevCode: 0x0000000C
           Values:          
             - Value:           0x0000000000000003
               BlockData:       
@@ -560,156 +560,156 @@
                 - 0xBC
                 - 0x7F
             - Value:           0x00000000000000A6
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
-        - AbbrCode:        0x0000000A
+        - AbbrevCode: 0x0000000A
           Values:          
             - Value:           0x00000000000000B9
             - Value:           0x000000000000007F
             - Value:           0x000000000000003C
             - Value:           0x0000000000000001
             - Value:           0x0000000000000013
-        - AbbrCode:        0x0000000B
+        - AbbrevCode: 0x0000000B
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
                 - 0x91
                 - 0x64
             - Value:           0x00000000000000C9
-        - AbbrCode:        0x0000000B
+        - AbbrevCode: 0x0000000B
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
                 - 0x91
                 - 0x60
             - Value:           0x00000000000000D4
-        - AbbrCode:        0x0000000B
+        - AbbrevCode: 0x0000000B
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
                 - 0x91
                 - 0x5C
             - Value:           0x00000000000000DF
-        - AbbrCode:        0x0000000B
+        - AbbrevCode: 0x0000000B
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
                 - 0x91
                 - 0x58
             - Value:           0x00000000000000EA
-        - AbbrCode:        0x0000000C
+        - AbbrevCode: 0x0000000C
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
                 - 0x91
                 - 0x54
             - Value:           0x00000000000000F5
-        - AbbrCode:        0x0000000A
+        - AbbrevCode: 0x0000000A
           Values:          
             - Value:           0x0000000000000080
             - Value:           0x000000000000008B
             - Value:           0x000000000000000C
             - Value:           0x0000000000000001
             - Value:           0x000000000000000C
-        - AbbrCode:        0x0000000B
+        - AbbrevCode: 0x0000000B
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
                 - 0x91
                 - 0x70
             - Value:           0x0000000000000090
-        - AbbrCode:        0x0000000B
+        - AbbrevCode: 0x0000000B
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
                 - 0x91
                 - 0x6C
             - Value:           0x000000000000009B
-        - AbbrCode:        0x0000000C
+        - AbbrevCode: 0x0000000C
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
                 - 0x91
                 - 0x68
             - Value:           0x00000000000000A6
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
-        - AbbrCode:        0x0000000A
+        - AbbrevCode: 0x0000000A
           Values:          
             - Value:           0x0000000000000080
             - Value:           0x00000000000000A3
             - Value:           0x0000000000000009
             - Value:           0x0000000000000001
             - Value:           0x000000000000000C
-        - AbbrCode:        0x0000000B
+        - AbbrevCode: 0x0000000B
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
                 - 0x91
                 - 0x7C
             - Value:           0x0000000000000090
-        - AbbrCode:        0x0000000B
+        - AbbrevCode: 0x0000000B
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
                 - 0x91
                 - 0x78
             - Value:           0x000000000000009B
-        - AbbrCode:        0x0000000C
+        - AbbrevCode: 0x0000000C
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
                 - 0x91
                 - 0x74
             - Value:           0x00000000000000A6
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
-        - AbbrCode:        0x0000000A
+        - AbbrevCode: 0x0000000A
           Values:          
             - Value:           0x0000000000000080
             - Value:           0x00000000000000CC
             - Value:           0x0000000000000009
             - Value:           0x0000000000000001
             - Value:           0x0000000000000014
-        - AbbrCode:        0x0000000B
+        - AbbrevCode: 0x0000000B
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
                 - 0x91
                 - 0x50
             - Value:           0x0000000000000090
-        - AbbrCode:        0x0000000B
+        - AbbrevCode: 0x0000000B
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
                 - 0x91
                 - 0x4C
             - Value:           0x000000000000009B
-        - AbbrCode:        0x0000000C
+        - AbbrevCode: 0x0000000C
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
                 - 0x91
                 - 0x48
             - Value:           0x00000000000000A6
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
-        - AbbrCode:        0x0000000D
+        - AbbrevCode: 0x0000000D
           Values:          
             - Value:           0x000000000000023A
-        - AbbrCode:        0x0000000D
+        - AbbrevCode: 0x0000000D
           Values:          
             - Value:           0x000000000000023F
-        - AbbrCode:        0x00000008
+        - AbbrevCode: 0x00000008
           Values:          
             - Value:           0x00000000000000D6
             - Value:           0x0000000000000006
             - Value:           0x0000000000000001
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
   debug_line:      
     - Length:          202
Index: lldb/unittests/Expression/DWARFExpressionTest.cpp
===================================================================
--- lldb/unittests/Expression/DWARFExpressionTest.cpp
+++ lldb/unittests/Expression/DWARFExpressionTest.cpp
@@ -94,45 +94,45 @@
       "      - Attribute:       DW_AT_byte_size\n"
       "        Form:            DW_FORM_data1\n"
       "debug_info:\n"
-      "  - Version:         4\n"
-      "    AbbrOffset:      0\n"
-      "    AddrSize:        8\n"
+      "  - Version:           4\n"
+      "    DebugAbbrevOffset: 0\n"
+      "    AddressSize:       8\n"
       "    Entries:\n"
-      "      - AbbrCode:        0x00000001\n"
+      "      - AbbrevCode: 0x00000001\n"
       "        Values:\n"
       "          - Value:           0x000000000000000C\n"
       // 0x0000000e:
-      "      - AbbrCode:        0x00000002\n"
+      "      - AbbrevCode: 0x00000002\n"
       "        Values:\n"
       "          - Value:           0x0000000000000007\n" // DW_ATE_unsigned
       "          - Value:           0x0000000000000004\n"
       // 0x00000011:
-      "      - AbbrCode:        0x00000002\n"
+      "      - AbbrevCode: 0x00000002\n"
       "        Values:\n"
       "          - Value:           0x0000000000000007\n" // DW_ATE_unsigned
       "          - Value:           0x0000000000000008\n"
       // 0x00000014:
-      "      - AbbrCode:        0x00000002\n"
+      "      - AbbrevCode: 0x00000002\n"
       "        Values:\n"
       "          - Value:           0x0000000000000005\n" // DW_ATE_signed
       "          - Value:           0x0000000000000008\n"
       // 0x00000017:
-      "      - AbbrCode:        0x00000002\n"
+      "      - AbbrevCode: 0x00000002\n"
       "        Values:\n"
       "          - Value:           0x0000000000000008\n" // DW_ATE_unsigned_char
       "          - Value:           0x0000000000000001\n"
       // 0x0000001a:
-      "      - AbbrCode:        0x00000002\n"
+      "      - AbbrevCode: 0x00000002\n"
       "        Values:\n"
       "          - Value:           0x0000000000000006\n" // DW_ATE_signed_char
       "          - Value:           0x0000000000000001\n"
       // 0x0000001d:
-      "      - AbbrCode:        0x00000002\n"
+      "      - AbbrevCode: 0x00000002\n"
       "        Values:\n"
       "          - Value:           0x000000000000000b\n" // DW_ATE_numeric_string
       "          - Value:           0x0000000000000001\n"
       ""
-      "      - AbbrCode:        0x00000000\n"
+      "      - AbbrevCode: 0x00000000\n"
       "        Values:          []\n";
   uint8_t offs_uint32_t = 0x0000000e;
   uint8_t offs_uint64_t = 0x00000011;
Index: lldb/test/API/functionalities/source-map/a.yaml
===================================================================
--- lldb/test/API/functionalities/source-map/a.yaml
+++ lldb/test/API/functionalities/source-map/a.yaml
@@ -296,12 +296,12 @@
         - Attribute:       DW_AT_type
           Form:            DW_FORM_ref4
   debug_info:      
-    - Length:          122
-      Version:         4
-      AbbrOffset:      0
-      AddrSize:        8
+    - Length:            122
+      Version:           4
+      DebugAbbrevOffset: 0
+      AddressSize:       8
       Entries:         
-        - AbbrCode:        0x00000001
+        - AbbrevCode: 0x00000001
           Values:          
             - Value:           0x0000000000000000
             - Value:           0x000000000000000C
@@ -310,7 +310,7 @@
             - Value:           0x000000000000003F
             - Value:           0x0000000000000000
             - Value:           0x0000000000000016
-        - AbbrCode:        0x00000002
+        - AbbrevCode: 0x00000002
           Values:          
             - Value:           0x0000000000000000
             - Value:           0x0000000000000016
@@ -323,7 +323,7 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000060
             - Value:           0x0000000000000001
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
@@ -333,7 +333,7 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000001
             - Value:           0x0000000000000060
-        - AbbrCode:        0x00000003
+        - AbbrevCode: 0x00000003
           Values:          
             - Value:           0x0000000000000002
               BlockData:       
@@ -343,28 +343,28 @@
             - Value:           0x0000000000000001
             - Value:           0x0000000000000001
             - Value:           0x0000000000000067
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
-        - AbbrCode:        0x00000004
+        - AbbrevCode: 0x00000004
           Values:          
             - Value:           0x0000000000000059
             - Value:           0x0000000000000005
             - Value:           0x0000000000000004
-        - AbbrCode:        0x00000005
+        - AbbrevCode: 0x00000005
           Values:          
             - Value:           0x000000000000006C
-        - AbbrCode:        0x00000005
+        - AbbrevCode: 0x00000005
           Values:          
             - Value:           0x0000000000000071
-        - AbbrCode:        0x00000006
+        - AbbrevCode: 0x00000006
           Values:          
             - Value:           0x0000000000000076
-        - AbbrCode:        0x00000004
+        - AbbrevCode: 0x00000004
           Values:          
             - Value:           0x0000000000000067
             - Value:           0x0000000000000006
             - Value:           0x0000000000000001
-        - AbbrCode:        0x00000000
+        - AbbrevCode: 0x00000000
           Values:          []
   debug_line:      
     - Length:          68
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Reply via email to