diff --git a/bolt/test/X86/dwarf4-types-dwarf5-types.test b/bolt/test/X86/dwarf4-types-dwarf5-types.test
--- a/bolt/test/X86/dwarf4-types-dwarf5-types.test
+++ b/bolt/test/X86/dwarf4-types-dwarf5-types.test
@@ -62,7 +62,7 @@
 # POSTCHECKTU: DW_TAG_pointer_type
 # POSTCHECKTU-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x0051 => {0x{{[0-9a-f]+}}} "char")
 # POSTCHECKTU: DW_TAG_base_type
-# POSTCHECKTU: DW_AT_name [DW_FORM_strp] ( .debug_str[0x0000000e] = "char")
+# POSTCHECKTU: DW_AT_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-f]+}}] = "char")
 
 # POSTCHECKTU: version = 0x0004
 # POSTCHECKTU-SAME: type_signature = 0x49dc260088be7e56
@@ -76,4 +76,4 @@
 # POSTCHECKTU: DW_TAG_pointer_type
 # POSTCHECKTU-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x0045 => {0x{{[0-9a-f]+}}} "char")
 # POSTCHECKTU: DW_TAG_base_type
-# POSTCHECKTU-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x0000000e] = "char")
+# POSTCHECKTU-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-f]+}}] = "char")
diff --git a/bolt/test/X86/dwarf4-types.test b/bolt/test/X86/dwarf4-types.test
--- a/bolt/test/X86/dwarf4-types.test
+++ b/bolt/test/X86/dwarf4-types.test
@@ -47,7 +47,7 @@
 # POSTCHECKTU: DW_TAG_pointer_type [4]
 # POSTCHECKTU-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x0051 => {0x00000051} "char")
 # POSTCHECKTU: DW_TAG_base_type [5]
-# POSTCHECKTU: DW_AT_name [DW_FORM_strp] ( .debug_str[0x0000000e] = "char")
+# POSTCHECKTU: DW_AT_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-f]+}}] = "char")
 
 # POSTCHECKTU: version = 0x0004
 # POSTCHECKTU-SAME: type_signature = 0x49dc260088be7e56
@@ -61,4 +61,4 @@
 # POSTCHECKTU: DW_TAG_pointer_type [4]
 # POSTCHECKTU-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x0045 => {0x0000009e} "char")
 # POSTCHECKTU: DW_TAG_base_type [5]
-# POSTCHECKTU-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x0000000e] = "char")
+# POSTCHECKTU-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-f]+}}] = "char")
diff --git a/bolt/test/X86/dwarf5-dwarf4-types-backward-forward-cross-reference.test b/bolt/test/X86/dwarf5-dwarf4-types-backward-forward-cross-reference.test
--- a/bolt/test/X86/dwarf5-dwarf4-types-backward-forward-cross-reference.test
+++ b/bolt/test/X86/dwarf5-dwarf4-types-backward-forward-cross-reference.test
@@ -32,16 +32,16 @@
 # POSTCHECKTU: version = 0x0004
 # POSTCHECKTU: DW_TAG_type_unit
 # POSTCHECKTU: DW_TAG_structure_type
-# POSTCHECKTU: DW_AT_name [DW_FORM_strp] ( .debug_str[0x00000020] = "Foo3a")
+# POSTCHECKTU: DW_AT_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-f]+}}] = "Foo3a")
 # POSTCHECKTU: version = 0x0004
 # POSTCHECKTU: DW_TAG_type_unit
 # POSTCHECKTU: DW_TAG_structure_type
-# POSTCHECKTU: DW_AT_name [DW_FORM_strp] ( .debug_str[0x00000035] = "Foo4")
+# POSTCHECKTU: DW_AT_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-f]+}}] = "Foo4")
 # POSTCHECKTU: version = 0x0004
 # POSTCHECKTU: DW_TAG_type_unit
 # POSTCHECKTU: DW_TAG_structure_type
-# POSTCHECKTU: DW_AT_name [DW_FORM_strp] ( .debug_str[0x0000004f] = "Foo4a")
+# POSTCHECKTU: DW_AT_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-f]+}}] = "Foo4a")
 # POSTCHECKTU: version = 0x0004
 # POSTCHECKTU: DW_TAG_type_unit
 # POSTCHECKTU: DW_TAG_structure_type
-# POSTCHECKTU: DW_AT_name [DW_FORM_strp] ( .debug_str[0x0000000e] = "Foo5")
+# POSTCHECKTU: DW_AT_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-f]+}}] = "Foo5")