5 files changed, 6 insertions, 45 deletions
diff --git a/llvm/test/DebugInfo/AArch64/line-header.ll b/llvm/test/DebugInfo/AArch64/line-header.ll
index de2453d1c25..f8220233faa 100644
--- a/llvm/test/DebugInfo/AArch64/line-header.ll
+++ b/llvm/test/DebugInfo/AArch64/line-header.ll
@@ -3,4 +3,4 @@
 
 ; check line table length is correctly calculated for both big and little endian
 CHECK-LABEL: .debug_line contents:
-CHECK: total_length: 0x0000003d
+CHECK: total_length: 0x0000003c
diff --git a/llvm/test/DebugInfo/Generic/empty.ll b/llvm/test/DebugInfo/Generic/empty.ll
index 1b22867cf19..82faeca41db 100644
--- a/llvm/test/DebugInfo/Generic/empty.ll
+++ b/llvm/test/DebugInfo/Generic/empty.ll
@@ -9,7 +9,7 @@
 ; Expect no line table entry since there are no functions and file references in this compile unit
 ; CHECK: .debug_line contents:
 ; CHECK: Line table prologue:
-; CHECK: total_length: 0x0000001a
+; CHECK: total_length: 0x00000019
 ; CHECK-NOT: file_names[
 
 ; CHECK: .debug_pubnames contents:
diff --git a/llvm/test/DebugInfo/X86/debug-line-version.s b/llvm/test/DebugInfo/X86/debug-line-version.s
deleted file mode 100644
index 46041097047..00000000000
--- a/llvm/test/DebugInfo/X86/debug-line-version.s
+++ /dev/null
@@ -1,39 +0,0 @@
-// RUN: llvm-mc -g -dwarf-version 2 -triple  i686-pc-linux-gnu %s -filetype=obj -o - | llvm-dwarfdump - | FileCheck --check-prefix=DWARF2 %s
-// RUN: llvm-mc -g -dwarf-version 3 -triple  i686-pc-linux-gnu %s -filetype=obj -o -  |llvm-dwarfdump - | FileCheck --check-prefix=DWARF3 %s
-// RUN: llvm-mc -g -dwarf-version 4 -triple  i686-pc-linux-gnu %s -filetype=obj -o - | llvm-dwarfdump - | FileCheck  --check-prefix=DWARF4 %s
-
-
-// Check that we generate debug_line version that matches the dwarf version.
-// For DWARF-4, additionally check that maximum_operations_per_instruction
-// field is emitted.
-
-    .text
-    .globl foo
-    .type foo, @function
-    .align 4
-foo:
-    ret
-    .size foo, .-foo
-
-// DWARF2: Compile Unit: length = {{.*}} version = 0x0002
-// DWARF2: Line table prologue:
-// DWARF2-NEXT:    total_length: 0x00000077
-// DWARF2-NEXT:         version: 2
-// DWARF2-NEXT: prologue_length: 0x00000062
-// DWARF2-NOT: max_ops_per_inst: 1
-
-// DWARF3: Compile Unit: length = {{.*}} version = 0x0003
-// DWARF3: Line table prologue:
-// DWARF3-NEXT:    total_length: 0x00000077
-// DWARF3-NEXT:         version: 3
-// DWARF3-NEXT: prologue_length: 0x00000062
-// DWARF3-NOT: max_ops_per_inst: 1
-
-
-// DWARF4: Compile Unit: length = {{.*}} version = 0x0004
-// DWARF4: Line table prologue:
-// DWARF4-NEXT:    total_length: 0x00000078
-// DWARF4-NEXT:         version: 4
-// DWARF4-NEXT: prologue_length: 0x00000063
-// DWARF4: max_ops_per_inst: 1
-
diff --git a/llvm/test/DebugInfo/X86/empty.ll b/llvm/test/DebugInfo/X86/empty.ll
index 6506f5567ad..e156e3bbe5e 100644
--- a/llvm/test/DebugInfo/X86/empty.ll
+++ b/llvm/test/DebugInfo/X86/empty.ll
@@ -4,7 +4,7 @@
 ; Expect no line table entry since there are no functions and file references in this compile unit
 ; CHECK: .debug_line contents:
 ; CHECK: Line table prologue:
-; CHECK: total_length: 0x0000001a
+; CHECK: total_length: 0x00000019
 ; CHECK-NOT: file_names[
 
 ; CHECK: .debug_pubnames contents:
diff --git a/llvm/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll b/llvm/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll
index a60725fe685..527f577134c 100644
--- a/llvm/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll
+++ b/llvm/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll
@@ -15,7 +15,7 @@
 ; CHECK: DW_AT_high_pc [DW_FORM_data4]          (0x00000010)
 
 ; CHECK: DW_TAG_compile_unit
-; CHECK: DW_AT_stmt_list [DW_FORM_sec_offset]   (0x0000003d)
+; CHECK: DW_AT_stmt_list [DW_FORM_sec_offset]   (0x0000003c)
 ; CHECK: DW_AT_low_pc [DW_FORM_addr]            (0x0000000000000010)
 ; CHECK: DW_AT_high_pc [DW_FORM_data4]          (0x00000009)
 ; CHECK: DW_TAG_subprogram
@@ -25,10 +25,10 @@
 
 ; CHECK: .debug_line contents:
 ; CHECK-NEXT: Line table prologue:
-; CHECK-NEXT: total_length: 0x00000039
+; CHECK-NEXT: total_length: 0x00000038
 ; CHECK: file_names[  1]    0 0x00000000 0x00000000 simple.c
 ; CHECK: Line table prologue:
-; CHECK-NEXT: total_length: 0x0000003a
+; CHECK-NEXT: total_length: 0x00000039
 ; CHECK: file_names[  1]    0 0x00000000 0x00000000 simple2.c
 ; CHECK-NOT: file_names