diff --git a/llvm/test/tools/obj2yaml/MachO/debug-abbrev.yaml b/llvm/test/tools/obj2yaml/MachO/debug-abbrev.yaml
new file mode 100644
--- /dev/null
+++ b/llvm/test/tools/obj2yaml/MachO/debug-abbrev.yaml
@@ -0,0 +1,82 @@
+# RUN: yaml2obj --docnum=1 %s | obj2yaml | FileCheck %s --check-prefix=ABBREV
+
+#      ABBREV: DWARF:
+# ABBREV-NEXT:   debug_abbrev:
+# ABBREV-NEXT:     - ID:              0
+
+--- !mach-o
+IsLittleEndian: true
+FileHeader:
+  magic:      0xFEEDFACF
+  cputype:    0x01000007
+  cpusubtype: 0x00000003
+  filetype:   0x0000000A
+  ncmds:      1
+  sizeofcmds: 232
+  flags:      0x00000000
+  reserved:   0x00000000
+LoadCommands:
+  - cmd:      LC_SEGMENT_64
+    cmdsize:  152
+    segname:  __DWARF
+    vmaddr:   0x00
+    vmsize:   0x00
+    fileoff:  0x00
+    filesize: 0x00
+    maxprot:  0
+    initprot: 0
+    nsects:   1
+    flags:    0
+    Sections:
+      - sectname:  __debug_abbrev
+        segname:   __DWARF
+        addr:      0x00
+        size:      128
+        offset:    528
+        align:     0
+        reloff:    0x00000000
+        nreloc:    0
+        flags:     0x00000000
+        reserved1: 0x00000000
+        reserved2: 0x00000000
+        reserved3: 0x00000000
+DWARF:
+  debug_abbrev:
+      - ID:              0
+        Table:
+          - Code:            0x0000000000000001
+            Tag:             DW_TAG_compile_unit
+            Children:        DW_CHILDREN_yes
+            Attributes:
+              - Attribute:       DW_AT_producer
+                Form:            DW_FORM_strp
+              - Attribute:       DW_AT_language
+                Form:            DW_FORM_data2
+              - Attribute:       DW_AT_name
+                Form:            DW_FORM_strp
+              - Attribute:       DW_AT_stmt_list
+                Form:            DW_FORM_sec_offset
+              - Attribute:       DW_AT_comp_dir
+                Form:            DW_FORM_strp
+              - Attribute:       DW_AT_low_pc
+                Form:            DW_FORM_addr
+              - Attribute:       DW_AT_high_pc
+                Form:            DW_FORM_data4
+          - Code:            0x0000000000000002
+            Tag:             DW_TAG_compile_unit
+            Children:        DW_CHILDREN_yes
+            Attributes:
+              - Attribute:       DW_AT_producer
+                Form:            DW_FORM_strp
+              - Attribute:       DW_AT_language
+                Form:            DW_FORM_data2
+              - Attribute:       DW_AT_name
+                Form:            DW_FORM_strp
+              - Attribute:       DW_AT_stmt_list
+                Form:            DW_FORM_sec_offset
+              - Attribute:       DW_AT_comp_dir
+                Form:            DW_FORM_strp
+              - Attribute:       DW_AT_low_pc
+                Form:            DW_FORM_addr
+              - Attribute:       DW_AT_high_pc
+                Form:            DW_FORM_data4
diff --git a/llvm/tools/obj2yaml/dwarf2yaml.cpp b/llvm/tools/obj2yaml/dwarf2yaml.cpp
--- a/llvm/tools/obj2yaml/dwarf2yaml.cpp
+++ b/llvm/tools/obj2yaml/dwarf2yaml.cpp
@@ -39,7 +39,8 @@
             AttAbrv.Value = Attribute.getImplicitConstValue();
           Abbrv.Attributes.push_back(AttAbrv);
         }
-        Y.DebugAbbrev.back().ID = AbbrevTableID++;
+        if (!Y.DebugAbbrev.back().ID.hasValue())
+          Y.DebugAbbrev.back().ID = AbbrevTableID++;
         Y.DebugAbbrev.back().Table.push_back(Abbrv);
       }
     }