diff --git a/lib/DebugInfo/DWARF/DWARFUnitIndex.cpp b/lib/DebugInfo/DWARF/DWARFUnitIndex.cpp
index f783d47b369..3d4cecce27d 100644
--- a/lib/DebugInfo/DWARF/DWARFUnitIndex.cpp
+++ b/lib/DebugInfo/DWARF/DWARFUnitIndex.cpp
@@ -112,7 +112,7 @@ bool DWARFUnitIndex::Header::parse(DataExtractor IndexData,
 }
 
 void DWARFUnitIndex::Header::dump(raw_ostream &OS) const {
-  OS << format("version = %u slots = %u\n\n", Version, NumBuckets);
+  OS << format("version = %u, units = %u, slots = %u\n\n", Version, NumUnits, NumBuckets);
 }
 
 bool DWARFUnitIndex::parse(DataExtractor IndexData) {
diff --git a/test/DebugInfo/X86/debug-cu-index-unknown-section.s b/test/DebugInfo/X86/debug-cu-index-unknown-section.s
index 147e4df2cc4..66a592cfa36 100644
--- a/test/DebugInfo/X86/debug-cu-index-unknown-section.s
+++ b/test/DebugInfo/X86/debug-cu-index-unknown-section.s
@@ -3,7 +3,7 @@
 # RUN:   FileCheck %s --strict-whitespace
 
 # CHECK:      .debug_cu_index contents:
-# CHECK-NEXT: version = 2 slots = 2
+# CHECK-NEXT: version = 2, units = 1, slots = 2
 # CHECK-EMPTY:
 # CHECK-NEXT: Index Signature          Unknown: 9               INFO
 # CHECK-NEXT: ----- ------------------ ------------------------ ------------------------
diff --git a/test/DebugInfo/X86/dwp-v2-cu-index.s b/test/DebugInfo/X86/dwp-v2-cu-index.s
index 43d7b074bf5..e66865b0ec5 100644
--- a/test/DebugInfo/X86/dwp-v2-cu-index.s
+++ b/test/DebugInfo/X86/dwp-v2-cu-index.s
@@ -6,7 +6,7 @@
 # RUN:   FileCheck %s
 
 # CHECK:      .debug_cu_index contents:
-# CHECK-NEXT: version = 2 slots = 2
+# CHECK-NEXT: version = 2, units = 1, slots = 2
 # CHECK-EMPTY:
 # CHECK-NEXT: Index Signature          INFO                     ABBREV                   LINE                     LOC                      STR_OFFSETS              MACINFO                  MACRO
 # CHECK-NEXT: ----- ------------------ ------------------------ ------------------------ ------------------------ ------------------------ ------------------------ ------------------------ ------------------------
diff --git a/test/DebugInfo/X86/dwp-v2-tu-index.s b/test/DebugInfo/X86/dwp-v2-tu-index.s
index 302ac7ed518..d10bb4cef19 100644
--- a/test/DebugInfo/X86/dwp-v2-tu-index.s
+++ b/test/DebugInfo/X86/dwp-v2-tu-index.s
@@ -6,7 +6,7 @@
 # RUN:   FileCheck %s
 
 # CHECK:      .debug_tu_index contents:
-# CHECK-NEXT: version = 2 slots = 2
+# CHECK-NEXT: version = 2, units = 1, slots = 2
 # CHECK-EMPTY:
 # CHECK-NEXT: Index Signature          TYPES                    ABBREV                   LINE                     STR_OFFSETS
 # CHECK-NEXT: ----- ------------------ ------------------------ ------------------------ ------------------------ ------------------------
diff --git a/test/DebugInfo/X86/dwp-v5-cu-index.s b/test/DebugInfo/X86/dwp-v5-cu-index.s
index 0cc1ee8e87d..6c4aac855ff 100644
--- a/test/DebugInfo/X86/dwp-v5-cu-index.s
+++ b/test/DebugInfo/X86/dwp-v5-cu-index.s
@@ -6,7 +6,7 @@
 # RUN:   FileCheck %s
 
 # CHECK:      .debug_cu_index contents:
-# CHECK-NEXT: version = 5 slots = 2
+# CHECK-NEXT: version = 5, units = 1, slots = 2
 # CHECK-EMPTY:
 # CHECK-NEXT: Index Signature          INFO                     ABBREV                   LINE                     LOCLISTS                 STR_OFFSETS              MACRO                    RNGLISTS
 # CHECK-NEXT: ----- ------------------ ------------------------ ------------------------ ------------------------ ------------------------ ------------------------ ------------------------ ------------------------
diff --git a/test/DebugInfo/X86/dwp-v5-tu-index.s b/test/DebugInfo/X86/dwp-v5-tu-index.s
index e050296cd41..0d6527701b0 100644
--- a/test/DebugInfo/X86/dwp-v5-tu-index.s
+++ b/test/DebugInfo/X86/dwp-v5-tu-index.s
@@ -6,7 +6,7 @@
 # RUN:   FileCheck %s
 
 # CHECK:      .debug_tu_index contents:
-# CHECK-NEXT: version = 5 slots = 2
+# CHECK-NEXT: version = 5, units = 1, slots = 2
 # CHECK-EMPTY:
 # CHECK-NEXT: Index Signature          INFO                     ABBREV                   LINE                     STR_OFFSETS
 # CHECK-NEXT: ----- ------------------ ------------------------ ------------------------ ------------------------ ------------------------
diff --git a/test/DebugInfo/dwarfdump-dwp.test b/test/DebugInfo/dwarfdump-dwp.test
index 7d945eccf64..0f57a513eac 100644
--- a/test/DebugInfo/dwarfdump-dwp.test
+++ b/test/DebugInfo/dwarfdump-dwp.test
@@ -37,14 +37,14 @@ RUN: llvm-dwarfdump -v %p/Inputs/dwarfdump-dwp.x86_64.o | FileCheck %s
 ; CHECK:       DW_AT_decl_file {{.*}} ("b.cpp")
 
 ; CHECK: .debug_cu_index contents:
-; CHECK-NEXT: version = 2 slots = 16
+; CHECK-NEXT: version = 2, units = 2, slots = 16
 ; CHECK:      Index Signature          INFO                     ABBREV                   LINE                     STR_OFFSETS
 ; CHECK-NEXT: ----- ------------------ ------------------------ ------------------------ ------------------------ ------------------------
 ; CHECK-NEXT:     3 0xfef104c25502f092 [0x0000002d, 0x0000005f) [0x00000043, 0x0000008e) [0x0000001a, 0x00000034) [0x00000010, 0x00000024)
 ; CHECK-NEXT:     9 0x03c30756e2d45008 [0x00000000, 0x0000002d) [0x00000000, 0x00000043) [0x00000000, 0x0000001a) [0x00000000, 0x00000010)
 
 ; CHECK: .debug_tu_index contents:
-; CHECK-NEXT: version = 2 slots = 16
+; CHECK-NEXT: version = 2, units = 2, slots = 16
 ; CHECK:      Index Signature          TYPES                    ABBREV                   LINE                     STR_OFFSETS
 ; CHECK-NEXT: ----- ------------------ ------------------------ ------------------------ ------------------------ ------------------------
 ; CHECK-NEXT:     9 0x1d02f3be30cc5688 [0x00000024, 0x00000048) [0x00000043, 0x0000008e) [0x0000001a, 0x00000034) [0x00000010, 0x00000024)
diff --git a/test/tools/llvm-dwp/X86/info-v5.s b/test/tools/llvm-dwp/X86/info-v5.s
index 22da132e6d2..c4ffdfc2601 100644
--- a/test/tools/llvm-dwp/X86/info-v5.s
+++ b/test/tools/llvm-dwp/X86/info-v5.s
@@ -9,7 +9,7 @@
 #CHECK: 0x00000000: Compile Unit: length = 0x00000050, format = DWARF32, version = 0x0005, unit_type = DW_UT_split_compile, abbr_offset = 0x0000, addr_size = 0x08, DWO_id = [[DWOID:.*]] (next unit at 0x00000054)
 
 # CHECK-DAG: .debug_cu_index contents:
-# CHECK: version = 2 slots = 2
+# CHECK: version = 2, units = 1, slots = 2
 # CHECK: Index Signature          INFO                     ABBREV
 # CHECK: 1 [[DWOID]] [0x00000000, 0x00000054) [0x00000000, 0x0000002a)
 
diff --git a/test/tools/llvm-dwp/X86/unknown-section-id.s b/test/tools/llvm-dwp/X86/unknown-section-id.s
index 384b58da0c6..387dbc822b0 100644
--- a/test/tools/llvm-dwp/X86/unknown-section-id.s
+++ b/test/tools/llvm-dwp/X86/unknown-section-id.s
@@ -13,7 +13,7 @@
 ## identifiers is copied.
 
 # CHECK:      .debug_cu_index contents:
-# CHECK-NEXT: version = 2 slots = 2
+# CHECK-NEXT: version = 2, units = 1, slots = 2
 # CHECK:      Index Signature INFO ABBREV
 # CHECK-NOT:  Unknown
 # CHECK:      -----
@@ -21,7 +21,7 @@
 # CHECK-NOT:  [
 
 # CHECK:      .debug_tu_index contents:
-# CHECK-NEXT: version = 2 slots = 2
+# CHECK-NEXT: version = 2, units = 1, slots = 2
 # CHECK:      Index Signature TYPES ABBREV
 # CHECK-NOT:  Unknown
 # CHECK:      -----