diff --git a/bolt/test/X86/Inputs/dwarf5-cu-no-debug-addr-helper.s b/bolt/test/X86/Inputs/dwarf5-cu-no-debug-addr-helper.s
--- a/bolt/test/X86/Inputs/dwarf5-cu-no-debug-addr-helper.s
+++ b/bolt/test/X86/Inputs/dwarf5-cu-no-debug-addr-helper.s
@@ -107,7 +107,7 @@
 	#.long	.Laddr_table_base0              # DW_AT_addr_base mannually removed
 	.byte	2                               # Abbrev [2] 0x1e:0xc DW_TAG_variable
 	.byte	3                               # DW_AT_name
-	.long	42                              # DW_AT_type
+	.long	35                              # DW_AT_type
 	.byte	0                               # DW_AT_decl_file
 	.byte	4                               # DW_AT_decl_line
 	#.byte	2                               # DW_AT_location manually removed
@@ -121,7 +121,7 @@
 	.byte	2                               # DW_AT_decl_line
 	.byte	4                               # Abbrev [4] 0x2f:0x9 DW_TAG_member
 	.byte	4                               # DW_AT_name
-	.long	57                              # DW_AT_type
+	.long	50                              # DW_AT_type
 	.byte	0                               # DW_AT_decl_file
 	.byte	3                               # DW_AT_decl_line
 	.byte	0                               # DW_AT_data_member_location
diff --git a/bolt/test/X86/Inputs/dwarf5-loc-base-no-loc-accesshelper.s b/bolt/test/X86/Inputs/dwarf5-loc-base-no-loc-accesshelper.s
--- a/bolt/test/X86/Inputs/dwarf5-loc-base-no-loc-accesshelper.s
+++ b/bolt/test/X86/Inputs/dwarf5-loc-base-no-loc-accesshelper.s
@@ -302,7 +302,7 @@
                                         # DW_AT_call_all_calls
 	.long	74                              # DW_AT_abstract_origin
 	.byte	5                               # Abbrev [5] 0x42:0x7 DW_TAG_formal_parameter
-	.long	79                              # DW_AT_abstract_origin
+	.long	74                              # DW_AT_abstract_origin
 	.byte	0                               # End Of Children Mark
 	.byte	6                               # Abbrev [6] 0x4a:0xe DW_TAG_subprogram
 	.byte	5                               # DW_AT_linkage_name
diff --git a/bolt/test/X86/Inputs/dwarf5-return-pc-form-addr-main.s b/bolt/test/X86/Inputs/dwarf5-return-pc-form-addr-main.s
--- a/bolt/test/X86/Inputs/dwarf5-return-pc-form-addr-main.s
+++ b/bolt/test/X86/Inputs/dwarf5-return-pc-form-addr-main.s
@@ -429,7 +429,7 @@
 	.byte	11                              # DW_AT_name
 	.byte	0                               # DW_AT_decl_file
 	.byte	7                               # DW_AT_decl_line
-	.long	161                             # DW_AT_type
+	.long	162                             # DW_AT_type
 	.byte	8                               # Abbrev [8] 0x68:0x1d DW_TAG_lexical_block
 	.byte	3                               # DW_AT_low_pc
 	.long	.Ltmp8-.Ltmp4                   # DW_AT_high_pc
@@ -469,9 +469,9 @@
 	.long	50                              # DW_AT_type
 	.byte	0                               # End Of Children Mark
 	.byte	15                              # Abbrev [15] 0xa1:0x5 DW_TAG_pointer_type
-	.long	166                             # DW_AT_type
+	.long	162                             # DW_AT_type
 	.byte	15                              # Abbrev [15] 0xa6:0x5 DW_TAG_pointer_type
-	.long	171                             # DW_AT_type
+	.long	168                             # DW_AT_type
 	.byte	3                               # Abbrev [3] 0xab:0x4 DW_TAG_base_type
 	.byte	12                              # DW_AT_name
 	.byte	6                               # DW_AT_encoding
diff --git a/bolt/test/X86/dwarf5-return-pc-form-addr.test b/bolt/test/X86/dwarf5-return-pc-form-addr.test
--- a/bolt/test/X86/dwarf5-return-pc-form-addr.test
+++ b/bolt/test/X86/dwarf5-return-pc-form-addr.test
@@ -20,7 +20,7 @@
 # PRECHECK: callq
 # PRECHECK-NEXT: [[#ADDR]]:
 
-# POSTCHECK: DW_TAG_call_site [12]
+# POSTCHECK: DW_TAG_call_site [11]
 # POSTCHECK-NEXT: DW_AT_call_origin [DW_FORM_ref4]
 # POSTCHECK-NEXT: DW_AT_call_return_pc [DW_FORM_addr]
 # POSTCHECK-SAME: 0x[[#%x,ADDR:]])