diff --git a/llvm/lib/DWP/DWP.cpp b/llvm/lib/DWP/DWP.cpp
--- a/llvm/lib/DWP/DWP.cpp
+++ b/llvm/lib/DWP/DWP.cpp
@@ -10,6 +10,7 @@
 // package files).
 //
 //===----------------------------------------------------------------------===//
+#include "llvm/ADT/Twine.h"
 #include "llvm/DWP/DWP.h"
 #include "llvm/DWP/DWPError.h"
 #include "llvm/MC/MCContext.h"
@@ -189,9 +190,10 @@
 static Error sectionOverflowErrorOrWarning(
   uint32_t PrevOffset, uint32_t OverflowedOffset, 
   StringRef SectionName) {
-  std::string Msg = SectionName.str() + std::string(" Section Contribution Offset overflow 4G. Previous Offset ")
-    + std::to_string(PrevOffset) + std::string(", After overflow offset ") 
-    + std::to_string(OverflowedOffset) + std::string(".");
+  std::string Msg = (SectionName
+    + Twine(" Section Contribution Offset overflow 4G. Previous Offset ")
+    + Twine(PrevOffset) + Twine(", After overflow offset ") 
+    + Twine(OverflowedOffset) + Twine(".")).str();
   if (ContinueOnCuIndexOverflow) {
     WithColor::defaultWarningHandler(make_error<DWPError>(Msg));
     return Error::success();
@@ -232,12 +234,12 @@
         C.getLength()));
     C.setOffset(TypesOffset);
     uint32_t OldOffset = TypesOffset;
+    static_assert(sizeof(OldOffset == TypesOffset));
     TypesOffset += C.getLength();
     if (OldOffset > TypesOffset) {
-      Error Err (sectionOverflowErrorOrWarning(OldOffset, TypesOffset, "Types"));
-      if (Err) {
+      if (Error Err = 
+            sectionOverflowErrorOrWarning(OldOffset, TypesOffset, "Types"))
         return Err;
-      }
     }
   }
   return Error::success();
@@ -275,10 +277,9 @@
       uint32_t OldOffset = TypesOffset;
       TypesOffset += C.getLength32();
       if (OldOffset > TypesOffset) {
-        Error Err (sectionOverflowErrorOrWarning(OldOffset, TypesOffset, "types"));
-        if (Err) {
+        if (Error Err = 
+              sectionOverflowErrorOrWarning(OldOffset, TypesOffset, "types"))
           return Err;
-        }
       }
     }
   }
@@ -685,7 +686,7 @@
       CurEntry.Contributions[Index].setLength(Pair.second);
       uint32_t OldOffset = ContributionOffsets[Index];
       ContributionOffsets[Index] += CurEntry.Contributions[Index].getLength32();
-      if (ContributionOffsets[Index] < OldOffset) {
+      if (OldOffset > ContributionOffsets[Index]) {
         uint32_t SectionIndex = 0;
         for (auto &Section : Obj.sections()) {
           if (SectionIndex == Index) {
@@ -719,14 +720,10 @@
 
           if (std::numeric_limits<uint32_t>::max() - InfoSectionOffset <
               C.getLength32()) {
-            Error Err (sectionOverflowErrorOrWarning(
-              InfoSectionOffset, InfoSectionOffset + C.getLength32(), "debug_info"));
-            if (Err) {
+            if (Error Err = sectionOverflowErrorOrWarning(
+              InfoSectionOffset, InfoSectionOffset + C.getLength32(), "debug_info"))
               return Err;
-            }
           }
-            // return make_error<DWPError>(
-            //     "debug information section offset is greater than 4GB");
 
           UnitOffset += C.getLength32();
           if (Header.Version < 5 ||
@@ -762,14 +759,11 @@
         return make_error<DWPError>("no compile unit found in file: " + Input);
 
       if (IndexVersion == 2) {
-        // Add types from the .debug_types section from DWARF < 5.
-        Error Err = 
-          addAllTypesFromTypesSection(
+        // Add types from the .debug_types section from DWARF < 5.          
+        if (Error Err = addAllTypesFromTypesSection(
             Out, TypeIndexEntries, TypesSection, CurTypesSection, CurEntry,
-            ContributionOffsets[getContributionIndex(DW_SECT_EXT_TYPES, 2)]);
-        if (Err) {
+            ContributionOffsets[getContributionIndex(DW_SECT_EXT_TYPES, 2)]))
           return Err;
-        }
       }
       continue;
     }
@@ -863,13 +857,12 @@
 
       unsigned TypesContributionIndex =
           getContributionIndex(TUSectionKind, IndexVersion);
-      Error Err = addAllTypesFromDWP(Out, TypeIndexEntries, TUIndex, OutSection,
-                                    TypeInputSection, CurEntry,
-                                    ContributionOffsets[TypesContributionIndex],
-                                    TypesContributionIndex);
-      if (Err) {
+      if (Error Err = 
+          addAllTypesFromDWP(Out, TypeIndexEntries, TUIndex, OutSection,
+                            TypeInputSection, CurEntry,
+                            ContributionOffsets[TypesContributionIndex],
+                            TypesContributionIndex))
         return Err;
-      }
     }
   }
 
diff --git a/llvm/test/tools/llvm-dwp/Inputs/overflow/debug_info.s b/llvm/test/tools/llvm-dwp/Inputs/overflow/debug_info_v4.s
rename from llvm/test/tools/llvm-dwp/Inputs/overflow/debug_info.s
rename to llvm/test/tools/llvm-dwp/Inputs/overflow/debug_info_v4.s
--- a/llvm/test/tools/llvm-dwp/Inputs/overflow/debug_info.s
+++ b/llvm/test/tools/llvm-dwp/Inputs/overflow/debug_info_v4.s
@@ -5,7 +5,7 @@
 	.type	hello,@function
 hello:                                  # @hello
 .Lfunc_begin0:
-	.file	1 "/data00/home/zhuna.1024/gdb-10.1/hello" "hello.c"
+	.file	1 "/xxxxxx/xxxx/xxxxxxxxxx/xxxxxxxx/hello" "hello.c"
 	.loc	1 3 0                           # hello.c:3:0
 	.cfi_startproc
 # %bb.0:
@@ -76,7 +76,7 @@
 	# .fill   4294967251   # = 2^32 - 1 - 44
 	.section	.debug_str,"MS",@progbits,1
 .Lskel_string0:
-	.asciz	"/data00/home/zhuna.1024/gdb-10.1/hello" # string offset=0
+	.asciz	"/xxxxxx/xxxx/xxxxxxxxxx/xxxxxxxx/hello" # string offset=0
 .Lskel_string1:
 	.asciz	"hello.dwo"                     # string offset=39
 	.section	.debug_str.dwo,"eMS",@progbits,1
@@ -178,4 +178,4 @@
 	.addrsig
 	.addrsig_sym printf
 	.section	.debug_line,"",@progbits
-.Lline_table_start0:
+.Lline_table_start0:
\ No newline at end of file
diff --git a/llvm/test/tools/llvm-dwp/Inputs/overflow/debug_str.s b/llvm/test/tools/llvm-dwp/Inputs/overflow/debug_info_v5.s
rename from llvm/test/tools/llvm-dwp/Inputs/overflow/debug_str.s
rename to llvm/test/tools/llvm-dwp/Inputs/overflow/debug_info_v5.s
--- a/llvm/test/tools/llvm-dwp/Inputs/overflow/debug_str.s
+++ b/llvm/test/tools/llvm-dwp/Inputs/overflow/debug_info_v5.s
@@ -5,21 +5,21 @@
 	.type	hello,@function
 hello:                                  # @hello
 .Lfunc_begin0:
-	.file	1 "/data00/home/zhuna.1024/gdb-10.1/hello" "hello.c"
-	.loc	1 3 0                           # hello.c:3:0
+	.file	0 "/home/zhuna.1024/gdb-10.1/hello" "hello.c" md5 0x0b447232502f439981a2fe9f11255f42
+	.loc	0 3 0                           # hello.c:3:0
 	.cfi_startproc
-# %bb.0:
+# %bb.0:                                # %entry
 	pushq	%rbp
 	.cfi_def_cfa_offset 16
 	.cfi_offset %rbp, -16
 	movq	%rsp, %rbp
 	.cfi_def_cfa_register %rbp
 .Ltmp0:
-	.loc	1 4 5 prologue_end              # hello.c:4:5
+	.loc	0 4 5 prologue_end              # hello.c:4:5
 	movabsq	$.L.str, %rdi
 	movb	$0, %al
 	callq	printf
-	.loc	1 5 1                           # hello.c:5:1
+	.loc	0 5 1                           # hello.c:5:1
 	popq	%rbp
 	.cfi_def_cfa %rsp, 8
 	retq
@@ -36,116 +36,127 @@
 
 	.section	.debug_abbrev,"",@progbits
 	.byte	1                               # Abbreviation Code
-	.byte	17                              # DW_TAG_compile_unit
+	.byte	74                              # DW_TAG_skeleton_unit
 	.byte	0                               # DW_CHILDREN_no
 	.byte	16                              # DW_AT_stmt_list
 	.byte	23                              # DW_FORM_sec_offset
+	.byte	114                             # DW_AT_str_offsets_base
+	.byte	23                              # DW_FORM_sec_offset
 	.byte	27                              # DW_AT_comp_dir
-	.byte	14                              # DW_FORM_strp
+	.byte	37                              # DW_FORM_strx1
 	.ascii	"\264B"                         # DW_AT_GNU_pubnames
 	.byte	25                              # DW_FORM_flag_present
-	.ascii	"\260B"                         # DW_AT_GNU_dwo_name
-	.byte	14                              # DW_FORM_strp
-	.ascii	"\261B"                         # DW_AT_GNU_dwo_id
-	.byte	7                               # DW_FORM_data8
+	.byte	118                             # DW_AT_dwo_name
+	.byte	37                              # DW_FORM_strx1
 	.byte	17                              # DW_AT_low_pc
-	.byte	1                               # DW_FORM_addr
+	.byte	27                              # DW_FORM_addrx
 	.byte	18                              # DW_AT_high_pc
 	.byte	6                               # DW_FORM_data4
-	.ascii	"\263B"                         # DW_AT_GNU_addr_base
+	.byte	115                             # DW_AT_addr_base
 	.byte	23                              # DW_FORM_sec_offset
 	.byte	0                               # EOM(1)
 	.byte	0                               # EOM(2)
 	.byte	0                               # EOM(3)
 	.section	.debug_info,"",@progbits
 .Lcu_begin0:
-	# .long	4294967295   # 2^32 - 1    #44                              # Length of Unit
-	.long	44                              # Length of Unit
-	.short	4                               # DWARF version number
-	.long	.debug_abbrev                   # Offset Into Abbrev. Section
+	.long	.Ldebug_info_end0-.Ldebug_info_start0 # Length of Unit
+.Ldebug_info_start0:
+	.short	5                               # DWARF version number
+	.byte	4                               # DWARF Unit Type
 	.byte	8                               # Address Size (in bytes)
-	.byte	1                               # Abbrev [1] 0xb:0x25 DW_TAG_compile_unit
+	.long	.debug_abbrev                   # Offset Into Abbrev. Section
+	.quad	-94954012350180462
+	.byte	1                               # Abbrev [1] 0x14:0x14 DW_TAG_skeleton_unit
 	.long	.Lline_table_start0             # DW_AT_stmt_list
-	.long	.Lskel_string0                  # DW_AT_comp_dir
+	.long	.Lstr_offsets_base0             # DW_AT_str_offsets_base
+	.byte	0                               # DW_AT_comp_dir
                                         # DW_AT_GNU_pubnames
-	.long	.Lskel_string1                  # DW_AT_GNU_dwo_name
-	.quad	-94954012350180462              # DW_AT_GNU_dwo_id
-	.quad	.Lfunc_begin0                   # DW_AT_low_pc
+	.byte	1                               # DW_AT_dwo_name
+	.byte	0                               # DW_AT_low_pc
 	.long	.Lfunc_end0-.Lfunc_begin0       # DW_AT_high_pc
-	.long	.Laddr_table_base0              # DW_AT_GNU_addr_base
-	# .fill   4294967251   # = 2^32 - 1 - 44
+	.long	.Laddr_table_base0              # DW_AT_addr_base
+.Ldebug_info_end0:
+	.section	.debug_str_offsets,"",@progbits
+	.long	12
+	.short	5
+	.short	0
+.Lstr_offsets_base0:
 	.section	.debug_str,"MS",@progbits,1
 .Lskel_string0:
-	.asciz	"/data00/home/zhuna.1024/gdb-10.1/hello" # string offset=0
+	.asciz	"/home/zhuna.1024/gdb-10.1/hello" # string offset=0
 .Lskel_string1:
-	.asciz	"hello.dwo"                     # string offset=39
+	.asciz	"hello.dwo"                     # string offset=32
+	.section	.debug_str_offsets,"",@progbits
+	.long	.Lskel_string0
+	.long	.Lskel_string1
+	.section	.debug_str_offsets.dwo,"e",@progbits
+	.long	20
+	.short	5
+	.short	0
 	.section	.debug_str.dwo,"eMS",@progbits,1
 .Linfo_string0:
 	.asciz	"hello"                         # string offset=0
 .Linfo_string1:
-	.asciz	"clang version 11.1.0 (https://github.com/llvm/llvm-project.git 173544ee3d09cdce8665f2097f677c31e1f1a9a1)" # string offset=6
+	.asciz	"clang version 11.1.0 (https://github.com/llvm/llvm-project.git 1a0dc1e010bf5c8034bd4a53340fc0dc3e90549a)" # string offset=6
 .Linfo_string2:
 	.asciz	"hello.c"                       # string offset=111
 .Linfo_string3:
 	.asciz	"hello.dwo"                     # string offset=119
-.Lfill_string:                              # string offset=128
-	.fill   4294967266, 1, 1  # 2^32 - 30
-
 	.section	.debug_str_offsets.dwo,"e",@progbits
 	.long	0
 	.long	6
 	.long	111
 	.long	119
-	.long   128
 	.section	.debug_info.dwo,"e",@progbits
-	.long	33                              # Length of Unit
-	.short	4                               # DWARF version number
-	.long	0                               # Offset Into Abbrev. Section
+	.long	.Ldebug_info_dwo_end0-.Ldebug_info_dwo_start0 # Length of Unit
+.Ldebug_info_dwo_start0:
+	.short	5                               # DWARF version number
+	.byte	5                               # DWARF Unit Type
 	.byte	8                               # Address Size (in bytes)
-	.byte	1                               # Abbrev [1] 0xb:0x1a DW_TAG_compile_unit
+	.long	0                               # Offset Into Abbrev. Section
+	.quad	-94954012350180462
+	.byte	1                               # Abbrev [1] 0x14:0x12 DW_TAG_compile_unit
 	.byte	1                               # DW_AT_producer
 	.short	12                              # DW_AT_language
 	.byte	2                               # DW_AT_name
-	.byte	3                               # DW_AT_GNU_dwo_name
-	.quad	-94954012350180462              # DW_AT_GNU_dwo_id
-	.byte	2                               # Abbrev [2] 0x19:0xb DW_TAG_subprogram
+	.byte	3                               # DW_AT_dwo_name
+	.byte	2                               # Abbrev [2] 0x1a:0xb DW_TAG_subprogram
 	.byte	0                               # DW_AT_low_pc
 	.long	.Lfunc_end0-.Lfunc_begin0       # DW_AT_high_pc
 	.byte	1                               # DW_AT_frame_base
 	.byte	86
 	.byte	0                               # DW_AT_name
-	.byte	1                               # DW_AT_decl_file
+	.byte	0                               # DW_AT_decl_file
 	.byte	3                               # DW_AT_decl_line
                                         # DW_AT_external
 	.byte	0                               # End Of Children Mark
-	# .fill   4294967233  # 2^32 - 30 - 33
+	.fill   4294967233
+.Ldebug_info_dwo_end0:
 	.section	.debug_abbrev.dwo,"e",@progbits
 	.byte	1                               # Abbreviation Code
 	.byte	17                              # DW_TAG_compile_unit
 	.byte	1                               # DW_CHILDREN_yes
 	.byte	37                              # DW_AT_producer
-	.ascii	"\202>"                         # DW_FORM_GNU_str_index
+	.byte	37                              # DW_FORM_strx1
 	.byte	19                              # DW_AT_language
 	.byte	5                               # DW_FORM_data2
 	.byte	3                               # DW_AT_name
-	.ascii	"\202>"                         # DW_FORM_GNU_str_index
-	.ascii	"\260B"                         # DW_AT_GNU_dwo_name
-	.ascii	"\202>"                         # DW_FORM_GNU_str_index
-	.ascii	"\261B"                         # DW_AT_GNU_dwo_id
-	.byte	7                               # DW_FORM_data8
+	.byte	37                              # DW_FORM_strx1
+	.byte	118                             # DW_AT_dwo_name
+	.byte	37                              # DW_FORM_strx1
 	.byte	0                               # EOM(1)
 	.byte	0                               # EOM(2)
 	.byte	2                               # Abbreviation Code
 	.byte	46                              # DW_TAG_subprogram
 	.byte	0                               # DW_CHILDREN_no
 	.byte	17                              # DW_AT_low_pc
-	.ascii	"\201>"                         # DW_FORM_GNU_addr_index
+	.byte	27                              # DW_FORM_addrx
 	.byte	18                              # DW_AT_high_pc
 	.byte	6                               # DW_FORM_data4
 	.byte	64                              # DW_AT_frame_base
 	.byte	24                              # DW_FORM_exprloc
 	.byte	3                               # DW_AT_name
-	.ascii	"\202>"                         # DW_FORM_GNU_str_index
+	.byte	37                              # DW_FORM_strx1
 	.byte	58                              # DW_AT_decl_file
 	.byte	11                              # DW_FORM_data1
 	.byte	59                              # DW_AT_decl_line
@@ -156,15 +167,21 @@
 	.byte	0                               # EOM(2)
 	.byte	0                               # EOM(3)
 	.section	.debug_addr,"",@progbits
+	.long	.Ldebug_addr_end0-.Ldebug_addr_start0 # Length of contribution
+.Ldebug_addr_start0:
+	.short	5                               # DWARF version number
+	.byte	8                               # Address size
+	.byte	0                               # Segment selector size
 .Laddr_table_base0:
 	.quad	.Lfunc_begin0
+.Ldebug_addr_end0:
 	.section	.debug_gnu_pubnames,"",@progbits
 	.long	.LpubNames_end0-.LpubNames_begin0 # Length of Public Names Info
 .LpubNames_begin0:
 	.short	2                               # DWARF Version
 	.long	.Lcu_begin0                     # Offset of Compilation Unit Info
-	.long	48                              # Compilation Unit Length
-	.long	25                              # DIE offset
+	.long	40                              # Compilation Unit Length
+	.long	26                              # DIE offset
 	.byte	48                              # Attributes: FUNCTION, EXTERNAL
 	.asciz	"hello"                         # External Name
 	.long	0                               # End Mark
@@ -174,10 +191,10 @@
 .LpubTypes_begin0:
 	.short	2                               # DWARF Version
 	.long	.Lcu_begin0                     # Offset of Compilation Unit Info
-	.long	48                              # Compilation Unit Length
+	.long	40                              # Compilation Unit Length
 	.long	0                               # End Mark
 .LpubTypes_end0:
-	.ident	"clang version 11.1.0 (https://github.com/llvm/llvm-project.git 173544ee3d09cdce8665f2097f677c31e1f1a9a1)"
+	.ident	"clang version 11.1.0 (https://github.com/llvm/llvm-project.git 1a0dc1e010bf5c8034bd4a53340fc0dc3e90549a)"
 	.section	".note.GNU-stack","",@progbits
 	.addrsig
 	.addrsig_sym printf
diff --git a/llvm/test/tools/llvm-dwp/Inputs/overflow/main.s b/llvm/test/tools/llvm-dwp/Inputs/overflow/main_v4.s
rename from llvm/test/tools/llvm-dwp/Inputs/overflow/main.s
rename to llvm/test/tools/llvm-dwp/Inputs/overflow/main_v4.s
--- a/llvm/test/tools/llvm-dwp/Inputs/overflow/main.s
+++ b/llvm/test/tools/llvm-dwp/Inputs/overflow/main_v4.s
@@ -5,7 +5,7 @@
 	.type	main,@function
 main:                                   # @main
 .Lfunc_begin0:
-	.file	1 "/data00/home/zhuna.1024/gdb-10.1/hello" "main.c"
+	.file	1 "/xxxxxx/xxxx/xxxxxxxxxx/xxxxxxxx/hello" "main.c"
 	.loc	1 5 0                           # main.c:5:0
 	.cfi_startproc
 # %bb.0:
@@ -73,7 +73,7 @@
 .Ldebug_info_end0:
 	.section	.debug_str,"MS",@progbits,1
 .Lskel_string0:
-	.asciz	"/data00/home/zhuna.1024/gdb-10.1/hello" # string offset=0
+	.asciz	"/xxxxxx/xxxx/xxxxxxxxxx/xxxxxxxx/hello" # string offset=0
 .Lskel_string1:
 	.asciz	"main.dwo"                      # string offset=39
 	.section	.debug_str.dwo,"eMS",@progbits,1
@@ -200,4 +200,4 @@
 	.addrsig
 	.addrsig_sym hello
 	.section	.debug_line,"",@progbits
-.Lline_table_start0:
+.Lline_table_start0:
\ No newline at end of file
diff --git a/llvm/test/tools/llvm-dwp/Inputs/overflow/main.s b/llvm/test/tools/llvm-dwp/Inputs/overflow/main_v5.s
rename from llvm/test/tools/llvm-dwp/Inputs/overflow/main.s
rename to llvm/test/tools/llvm-dwp/Inputs/overflow/main_v5.s
--- a/llvm/test/tools/llvm-dwp/Inputs/overflow/main.s
+++ b/llvm/test/tools/llvm-dwp/Inputs/overflow/main_v5.s
@@ -5,10 +5,10 @@
 	.type	main,@function
 main:                                   # @main
 .Lfunc_begin0:
-	.file	1 "/data00/home/zhuna.1024/gdb-10.1/hello" "main.c"
-	.loc	1 5 0                           # main.c:5:0
+	.file	0 "/home/zhuna.1024/gdb-10.1/hello" "main.c" md5 0x77ee8a574e83e137b0f31f877848b7ec
+	.loc	0 5 0                           # main.c:5:0
 	.cfi_startproc
-# %bb.0:
+# %bb.0:                                # %entry
 	pushq	%rbp
 	.cfi_def_cfa_offset 16
 	.cfi_offset %rbp, -16
@@ -17,11 +17,11 @@
 	subq	$16, %rsp
 	movl	$0, -4(%rbp)
 .Ltmp0:
-	.loc	1 6 5 prologue_end              # main.c:6:5
+	.loc	0 6 5 prologue_end              # main.c:6:5
 	movb	$0, %al
 	callq	hello
 	xorl	%eax, %eax
-	.loc	1 7 5                           # main.c:7:5
+	.loc	0 7 5                           # main.c:7:5
 	addq	$16, %rsp
 	popq	%rbp
 	.cfi_def_cfa %rsp, 8
@@ -33,23 +33,23 @@
                                         # -- End function
 	.section	.debug_abbrev,"",@progbits
 	.byte	1                               # Abbreviation Code
-	.byte	17                              # DW_TAG_compile_unit
+	.byte	74                              # DW_TAG_skeleton_unit
 	.byte	0                               # DW_CHILDREN_no
 	.byte	16                              # DW_AT_stmt_list
 	.byte	23                              # DW_FORM_sec_offset
+	.byte	114                             # DW_AT_str_offsets_base
+	.byte	23                              # DW_FORM_sec_offset
 	.byte	27                              # DW_AT_comp_dir
-	.byte	14                              # DW_FORM_strp
+	.byte	37                              # DW_FORM_strx1
 	.ascii	"\264B"                         # DW_AT_GNU_pubnames
 	.byte	25                              # DW_FORM_flag_present
-	.ascii	"\260B"                         # DW_AT_GNU_dwo_name
-	.byte	14                              # DW_FORM_strp
-	.ascii	"\261B"                         # DW_AT_GNU_dwo_id
-	.byte	7                               # DW_FORM_data8
+	.byte	118                             # DW_AT_dwo_name
+	.byte	37                              # DW_FORM_strx1
 	.byte	17                              # DW_AT_low_pc
-	.byte	1                               # DW_FORM_addr
+	.byte	27                              # DW_FORM_addrx
 	.byte	18                              # DW_AT_high_pc
 	.byte	6                               # DW_FORM_data4
-	.ascii	"\263B"                         # DW_AT_GNU_addr_base
+	.byte	115                             # DW_AT_addr_base
 	.byte	23                              # DW_FORM_sec_offset
 	.byte	0                               # EOM(1)
 	.byte	0                               # EOM(2)
@@ -58,31 +58,45 @@
 .Lcu_begin0:
 	.long	.Ldebug_info_end0-.Ldebug_info_start0 # Length of Unit
 .Ldebug_info_start0:
-	.short	4                               # DWARF version number
-	.long	.debug_abbrev                   # Offset Into Abbrev. Section
+	.short	5                               # DWARF version number
+	.byte	4                               # DWARF Unit Type
 	.byte	8                               # Address Size (in bytes)
-	.byte	1                               # Abbrev [1] 0xb:0x25 DW_TAG_compile_unit
+	.long	.debug_abbrev                   # Offset Into Abbrev. Section
+	.quad	-346972125991005518
+	.byte	1                               # Abbrev [1] 0x14:0x14 DW_TAG_skeleton_unit
 	.long	.Lline_table_start0             # DW_AT_stmt_list
-	.long	.Lskel_string0                  # DW_AT_comp_dir
+	.long	.Lstr_offsets_base0             # DW_AT_str_offsets_base
+	.byte	0                               # DW_AT_comp_dir
                                         # DW_AT_GNU_pubnames
-	.long	.Lskel_string1                  # DW_AT_GNU_dwo_name
-	.quad	-346972125991005518             # DW_AT_GNU_dwo_id
-	.quad	.Lfunc_begin0                   # DW_AT_low_pc
+	.byte	1                               # DW_AT_dwo_name
+	.byte	0                               # DW_AT_low_pc
 	.long	.Lfunc_end0-.Lfunc_begin0       # DW_AT_high_pc
-	.long	.Laddr_table_base0              # DW_AT_GNU_addr_base
+	.long	.Laddr_table_base0              # DW_AT_addr_base
 .Ldebug_info_end0:
+	.section	.debug_str_offsets,"",@progbits
+	.long	12
+	.short	5
+	.short	0
+.Lstr_offsets_base0:
 	.section	.debug_str,"MS",@progbits,1
 .Lskel_string0:
-	.asciz	"/data00/home/zhuna.1024/gdb-10.1/hello" # string offset=0
+	.asciz	"/home/zhuna.1024/gdb-10.1/hello" # string offset=0
 .Lskel_string1:
-	.asciz	"main.dwo"                      # string offset=39
+	.asciz	"main.dwo"                      # string offset=32
+	.section	.debug_str_offsets,"",@progbits
+	.long	.Lskel_string0
+	.long	.Lskel_string1
+	.section	.debug_str_offsets.dwo,"e",@progbits
+	.long	24
+	.short	5
+	.short	0
 	.section	.debug_str.dwo,"eMS",@progbits,1
 .Linfo_string0:
 	.asciz	"main"                          # string offset=0
 .Linfo_string1:
 	.asciz	"int"                           # string offset=5
 .Linfo_string2:
-	.asciz	"clang version 11.1.0 (https://github.com/llvm/llvm-project.git ed8f312fb1ca0bf525676906c7841db0cefcf5a7)" # string offset=9
+	.asciz	"clang version 11.1.0 (https://github.com/llvm/llvm-project.git 1a0dc1e010bf5c8034bd4a53340fc0dc3e90549a)" # string offset=9
 .Linfo_string3:
 	.asciz	"main.c"                        # string offset=114
 .Linfo_string4:
@@ -96,58 +110,58 @@
 	.section	.debug_info.dwo,"e",@progbits
 	.long	.Ldebug_info_dwo_end0-.Ldebug_info_dwo_start0 # Length of Unit
 .Ldebug_info_dwo_start0:
-	.short	4                               # DWARF version number
-	.long	0                               # Offset Into Abbrev. Section
+	.short	5                               # DWARF version number
+	.byte	5                               # DWARF Unit Type
 	.byte	8                               # Address Size (in bytes)
-	.byte	1                               # Abbrev [1] 0xb:0x22 DW_TAG_compile_unit
+	.long	0                               # Offset Into Abbrev. Section
+	.quad	-346972125991005518
+	.byte	1                               # Abbrev [1] 0x14:0x1a DW_TAG_compile_unit
 	.byte	2                               # DW_AT_producer
 	.short	12                              # DW_AT_language
 	.byte	3                               # DW_AT_name
-	.byte	4                               # DW_AT_GNU_dwo_name
-	.quad	-346972125991005518             # DW_AT_GNU_dwo_id
-	.byte	2                               # Abbrev [2] 0x19:0xf DW_TAG_subprogram
+	.byte	4                               # DW_AT_dwo_name
+	.byte	2                               # Abbrev [2] 0x1a:0xf DW_TAG_subprogram
 	.byte	0                               # DW_AT_low_pc
 	.long	.Lfunc_end0-.Lfunc_begin0       # DW_AT_high_pc
 	.byte	1                               # DW_AT_frame_base
 	.byte	86
 	.byte	0                               # DW_AT_name
-	.byte	1                               # DW_AT_decl_file
+	.byte	0                               # DW_AT_decl_file
 	.byte	5                               # DW_AT_decl_line
-	.long	40                              # DW_AT_type
+	.long	41                              # DW_AT_type
                                         # DW_AT_external
-	.byte	3                               # Abbrev [3] 0x28:0x4 DW_TAG_base_type
+	.byte	3                               # Abbrev [3] 0x29:0x4 DW_TAG_base_type
 	.byte	1                               # DW_AT_name
 	.byte	5                               # DW_AT_encoding
 	.byte	4                               # DW_AT_byte_size
 	.byte	0                               # End Of Children Mark
+	.fill   4294967233
 .Ldebug_info_dwo_end0:
 	.section	.debug_abbrev.dwo,"e",@progbits
 	.byte	1                               # Abbreviation Code
 	.byte	17                              # DW_TAG_compile_unit
 	.byte	1                               # DW_CHILDREN_yes
 	.byte	37                              # DW_AT_producer
-	.ascii	"\202>"                         # DW_FORM_GNU_str_index
+	.byte	37                              # DW_FORM_strx1
 	.byte	19                              # DW_AT_language
 	.byte	5                               # DW_FORM_data2
 	.byte	3                               # DW_AT_name
-	.ascii	"\202>"                         # DW_FORM_GNU_str_index
-	.ascii	"\260B"                         # DW_AT_GNU_dwo_name
-	.ascii	"\202>"                         # DW_FORM_GNU_str_index
-	.ascii	"\261B"                         # DW_AT_GNU_dwo_id
-	.byte	7                               # DW_FORM_data8
+	.byte	37                              # DW_FORM_strx1
+	.byte	118                             # DW_AT_dwo_name
+	.byte	37                              # DW_FORM_strx1
 	.byte	0                               # EOM(1)
 	.byte	0                               # EOM(2)
 	.byte	2                               # Abbreviation Code
 	.byte	46                              # DW_TAG_subprogram
 	.byte	0                               # DW_CHILDREN_no
 	.byte	17                              # DW_AT_low_pc
-	.ascii	"\201>"                         # DW_FORM_GNU_addr_index
+	.byte	27                              # DW_FORM_addrx
 	.byte	18                              # DW_AT_high_pc
 	.byte	6                               # DW_FORM_data4
 	.byte	64                              # DW_AT_frame_base
 	.byte	24                              # DW_FORM_exprloc
 	.byte	3                               # DW_AT_name
-	.ascii	"\202>"                         # DW_FORM_GNU_str_index
+	.byte	37                              # DW_FORM_strx1
 	.byte	58                              # DW_AT_decl_file
 	.byte	11                              # DW_FORM_data1
 	.byte	59                              # DW_AT_decl_line
@@ -162,7 +176,7 @@
 	.byte	36                              # DW_TAG_base_type
 	.byte	0                               # DW_CHILDREN_no
 	.byte	3                               # DW_AT_name
-	.ascii	"\202>"                         # DW_FORM_GNU_str_index
+	.byte	37                              # DW_FORM_strx1
 	.byte	62                              # DW_AT_encoding
 	.byte	11                              # DW_FORM_data1
 	.byte	11                              # DW_AT_byte_size
@@ -171,15 +185,21 @@
 	.byte	0                               # EOM(2)
 	.byte	0                               # EOM(3)
 	.section	.debug_addr,"",@progbits
+	.long	.Ldebug_addr_end0-.Ldebug_addr_start0 # Length of contribution
+.Ldebug_addr_start0:
+	.short	5                               # DWARF version number
+	.byte	8                               # Address size
+	.byte	0                               # Segment selector size
 .Laddr_table_base0:
 	.quad	.Lfunc_begin0
+.Ldebug_addr_end0:
 	.section	.debug_gnu_pubnames,"",@progbits
 	.long	.LpubNames_end0-.LpubNames_begin0 # Length of Public Names Info
 .LpubNames_begin0:
 	.short	2                               # DWARF Version
 	.long	.Lcu_begin0                     # Offset of Compilation Unit Info
-	.long	48                              # Compilation Unit Length
-	.long	25                              # DIE offset
+	.long	40                              # Compilation Unit Length
+	.long	26                              # DIE offset
 	.byte	48                              # Attributes: FUNCTION, EXTERNAL
 	.asciz	"main"                          # External Name
 	.long	0                               # End Mark
@@ -189,13 +209,13 @@
 .LpubTypes_begin0:
 	.short	2                               # DWARF Version
 	.long	.Lcu_begin0                     # Offset of Compilation Unit Info
-	.long	48                              # Compilation Unit Length
-	.long	40                              # DIE offset
+	.long	40                              # Compilation Unit Length
+	.long	41                              # DIE offset
 	.byte	144                             # Attributes: TYPE, STATIC
 	.asciz	"int"                           # External Name
 	.long	0                               # End Mark
 .LpubTypes_end0:
-	.ident	"clang version 11.1.0 (https://github.com/llvm/llvm-project.git ed8f312fb1ca0bf525676906c7841db0cefcf5a7)"
+	.ident	"clang version 11.1.0 (https://github.com/llvm/llvm-project.git 1a0dc1e010bf5c8034bd4a53340fc0dc3e90549a)"
 	.section	".note.GNU-stack","",@progbits
 	.addrsig
 	.addrsig_sym hello
diff --git a/llvm/test/tools/llvm-dwp/X86/overflow_debug_info.test b/llvm/test/tools/llvm-dwp/X86/overflow_debug_info.test
deleted file mode 100644
--- a/llvm/test/tools/llvm-dwp/X86/overflow_debug_info.test
+++ /dev/null
@@ -1,4 +0,0 @@
-RUN: llvm-mc --triple=x86_64-unknown-linux --filetype=obj --split-dwarf-file=debug_info.dwo -dwarf-version=5 %p/../Inputs/overflow/debug_info.s -o debug_info.o
-RUN: llvm-mc --triple=x86_64-unknown-linux --filetype=obj --split-dwarf-file=main.dwo -dwarf-version=5 %p/../Inputs/overflow/main.s -o main.o
-RUN: not llvm-dwp -e debug_info.o -e main.o -o overflow.dwp 2>&1 | FileCheck %s
-CHECK: error: {{.*}} Section Contribution Offset overflow 4G. Previous Offset {{.*}}, After overflow offset {{.*}}.
diff --git a/llvm/test/tools/llvm-dwp/X86/overflow_debug_info_v4.test b/llvm/test/tools/llvm-dwp/X86/overflow_debug_info_v4.test
new file mode 100644
--- /dev/null
+++ b/llvm/test/tools/llvm-dwp/X86/overflow_debug_info_v4.test
@@ -0,0 +1,4 @@
+RUN: llvm-mc --triple=x86_64-unknown-linux --filetype=obj --split-dwarf-file=debug_info_v4.dwo -dwarf-version=4 %p/../Inputs/overflow/debug_info_v4.s -o debug_info_v4.o
+RUN: llvm-mc --triple=x86_64-unknown-linux --filetype=obj --split-dwarf-file=main_v4.dwo -dwarf-version=4 %p/../Inputs/overflow/main_v4.s -o main_v4.o
+RUN: not llvm-dwp debug_info_v4.dwo main_v4.dwo -o overflow.dwp 2>&1 | FileCheck %s
+CHECK: error: {{.*}} Section Contribution Offset overflow 4G. Previous Offset {{.*}}, After overflow offset {{.*}}.
diff --git a/llvm/test/tools/llvm-dwp/X86/overflow_debug_info_v5.test b/llvm/test/tools/llvm-dwp/X86/overflow_debug_info_v5.test
new file mode 100644
--- /dev/null
+++ b/llvm/test/tools/llvm-dwp/X86/overflow_debug_info_v5.test
@@ -0,0 +1,4 @@
+RUN: llvm-mc --triple=x86_64-unknown-linux --filetype=obj --split-dwarf-file=debug_info_v5.dwo -dwarf-version=5 %p/../Inputs/overflow/debug_info_v5.s -o debug_info_v5.o
+RUN: llvm-mc --triple=x86_64-unknown-linux --filetype=obj --split-dwarf-file=main_v5.dwo -dwarf-version=5 %p/../Inputs/overflow/main_v5.s -o main_v5.o
+RUN: not llvm-dwp debug_info_v5.dwo main_v5.dwo -o overflow.dwp 2>&1 | FileCheck %s
+CHECK: error: {{.*}} Section Contribution Offset overflow 4G. Previous Offset {{.*}}, After overflow offset {{.*}}.
diff --git a/llvm/test/tools/llvm-dwp/X86/overflow_debug_info_warning.test b/llvm/test/tools/llvm-dwp/X86/overflow_debug_info_warning.test
deleted file mode 100644
--- a/llvm/test/tools/llvm-dwp/X86/overflow_debug_info_warning.test
+++ /dev/null
@@ -1,5 +0,0 @@
-RUN: llvm-mc --triple=x86_64-unknown-linux --filetype=obj --split-dwarf-file=debug_info.dwo -dwarf-version=5 %p/../Inputs/overflow/debug_info.s -o debug_info.o
-RUN: llvm-mc --triple=x86_64-unknown-linux --filetype=obj --split-dwarf-file=main.dwo -dwarf-version=5 %p/../Inputs/overflow/main.s -o main.o
-RUN: llvm-dwp -e debug_info.o -e main.o -continue-on-cu-index-overflow -o overflow.dwp 2>&1 | FileCheck %s
-RUN: llvm-dwp overflow.dwp -o overflow-warned.dwp
-CHECK: warning: {{.*}} Section Contribution Offset overflow 4G. Previous Offset {{.*}}, After overflow offset {{.*}}.
diff --git a/llvm/test/tools/llvm-dwp/X86/overflow_debug_info_warning_v4.test b/llvm/test/tools/llvm-dwp/X86/overflow_debug_info_warning_v4.test
new file mode 100644
--- /dev/null
+++ b/llvm/test/tools/llvm-dwp/X86/overflow_debug_info_warning_v4.test
@@ -0,0 +1,5 @@
+RUN: llvm-mc --triple=x86_64-unknown-linux --filetype=obj --split-dwarf-file=debug_info_v4.dwo -dwarf-version=4 %p/../Inputs/overflow/debug_info_v4.s -o debug_info_v4.o
+RUN: llvm-mc --triple=x86_64-unknown-linux --filetype=obj --split-dwarf-file=main_v4.dwo -dwarf-version=4 %p/../Inputs/overflow/main_v4.s -o main_v4.o
+RUN: llvm-dwp debug_info_v4.dwo main_v4.dwo -continue-on-cu-index-overflow -o overflow_v4.dwp 2>&1 | FileCheck %s
+RUN: llvm-dwp overflow_v4.dwp -o overflow_warned_v4.dwp
+CHECK: warning: {{.*}} Section Contribution Offset overflow 4G. Previous Offset {{.*}}, After overflow offset {{.*}}.
diff --git a/llvm/test/tools/llvm-dwp/X86/overflow_debug_info_warning_v5.test b/llvm/test/tools/llvm-dwp/X86/overflow_debug_info_warning_v5.test
new file mode 100644
--- /dev/null
+++ b/llvm/test/tools/llvm-dwp/X86/overflow_debug_info_warning_v5.test
@@ -0,0 +1,5 @@
+RUN: llvm-mc --triple=x86_64-unknown-linux --filetype=obj --split-dwarf-file=debug_info_v5.dwo -dwarf-version=5 %p/../Inputs/overflow/debug_info_v5.s -o debug_info_v5.o
+RUN: llvm-mc --triple=x86_64-unknown-linux --filetype=obj --split-dwarf-file=main_v5.dwo -dwarf-version=5 %p/../Inputs/overflow/main_v5.s -o main_v5.o
+RUN: llvm-dwp debug_info_v5.dwo main_v5.dwo -continue-on-cu-index-overflow -o overflow_v5.dwp 2>&1 | FileCheck %s
+RUN: llvm-dwp overflow_v5.dwp -o overflow_warned_v5.dwp
+CHECK: warning: {{.*}} Section Contribution Offset overflow 4G. Previous Offset {{.*}}, After overflow offset {{.*}}.
diff --git a/llvm/test/tools/llvm-dwp/X86/overflow_debug_str.test b/llvm/test/tools/llvm-dwp/X86/overflow_debug_str.test
deleted file mode 100644
--- a/llvm/test/tools/llvm-dwp/X86/overflow_debug_str.test
+++ /dev/null
@@ -1,4 +0,0 @@
-RUN: llvm-mc --triple=x86_64-unknown-linux --filetype=obj --split-dwarf-file=debug_str.dwo -dwarf-version=5 %p/../Inputs/overflow/debug_str.s -o debug_str.o
-RUN: llvm-mc --triple=x86_64-unknown-linux --filetype=obj --split-dwarf-file=main.dwo -dwarf-version=5 %p/../Inputs/overflow/main.s -o main.o
-RUN: not llvm-dwp -e debug_str.o -e main.o -o overflow.dwp 2>&1 | FileCheck %s
-CHECK: error: {{.*}} Section Contribution Offset overflow 4G. Previous Offset {{.*}}, After overflow offset {{.*}}.