[DWARF] Add printout for op-index

[dstenb]

Summary

This is a preparatory patch for extending DWARFDebugLine to properly
parse line number programs with maximum_operations_per_instruction > 1
for VLIW targets.

Add some scaffolding for handling op-index in line number programs, and
add printouts for that in the table. As this affects a lot of tests,
this is done in a separate commit to get a cleaner review for the actual
op-index implementation.

Verbose printouts are not present in many tests, and adding op-index to
those will require a bit more code changes, so that is done in the
actual implementation patch.

[dstenb]

As values in this column will always be 0 for non-VLIW targets, it might perhaps add a bit of clutter. If you prefer, I can instead upload a patch that makes the emission of the column conditional (for line number programs with maximum_operations_per_instruction > 1).

[dstenb]

Update two bolt test cases.

[StephenTozer]

In D152535#4408692, @dstenb wrote:

As values in this column will always be 0 for non-VLIW targets, it might perhaps add a bit of clutter. If you prefer, I can instead upload a patch that makes the emission of the column conditional (for line number programs with maximum_operations_per_instruction > 1).

This sounds preferable to me, but we don't currently make columns conditional based on whether or not they're needed, even when we could (isa and discriminator are also all-0 for many targets); defensively I'd suggest leaving it as it is.

bolt/test/AArch64/asm-func-debug.test

 CHECK-NEXT:       DW_AT_name ("{{.*}}asm_foo.s")
 
 # Check .debug_aranges was updated for asm module
 CHECK: .debug_aranges contents:
 CHECK-NEXT:   Address Range Header: length = 0x0000002c, format = DWARF32, version = 0x0002, cu_offset = 0x00000000, addr_size = 0x08, seg_size = 0x00
 CHECK-NEXT:   [0x0000000000[[#ADDR]], 0x0000000000[[#ADDR+4]])
 
 # Check line number info was updated
-CHECK:       0x0000000000[[#ADDR]]   13      0      0   0             0  is_stmt
-CHECK-NEXT:  0x0000000000[[#ADDR+4]] 13      0      0   0             0  is_stmt end_sequence
+CHECK:       0x0000000000[[#ADDR]]   13      0      0   0             0       0  is_stmt
+CHECK-NEXT:  0x0000000000[[#ADDR+4]] 13      0      0   0             0       0  is_stmt end_sequence

bolt/test/X86/asm-func-debug.test

 CHECK-NEXT:       DW_AT_name ("{{.*}}asm_foo.s")
 
 # Check .debug_aranges was updated for asm module
 CHECK: .debug_aranges contents:
 CHECK-NEXT:   Address Range Header: length = 0x0000002c, format = DWARF32, version = 0x0002, cu_offset = 0x00000000, addr_size = 0x08, seg_size = 0x00
 CHECK-NEXT:   [0x0000000000[[#ADDR]], 0x0000000000[[#ADDR+1]])
 
 # Check line number info was updated
-CHECK:       0x0000000000[[#ADDR]]   13      0      0   0             0  is_stmt
-CHECK-NEXT:  0x0000000000[[#ADDR+1]] 13      0      0   0             0  is_stmt end_sequence
+CHECK:       0x0000000000[[#ADDR]]   13      0      0   0             0       0  is_stmt
+CHECK-NEXT:  0x0000000000[[#ADDR+1]] 13      0      0   0             0       0  is_stmt end_sequence

llvm/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h

struct Row {
     /// corresponding to a machine instruction.
     uint16_t File;
     /// An unsigned integer representing the DWARF path discriminator value
     /// for this location.
     uint32_t Discriminator;
     /// An unsigned integer whose value encodes the applicable instruction set
     /// architecture for the current instruction.
     uint8_t Isa;
+    /// An unsigned integer representing the index of an operation within a
+    /// VLIW instruction. The index of the first operation is 0.
+    /// For non-VLIW architectures, this register will always be 0.
+    uint8_t OpIndex;
     /// A boolean indicating that the current instruction is the beginning of a
     /// statement.
     uint8_t IsStmt : 1,
         /// A boolean indicating that the current instruction is the
         /// beginning of a basic block.
         BasicBlock : 1,
         /// A boolean indicating that the current address is that of the
         /// first byte after the end of a sequence of target machine

llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp

void DWARFDebugLine::Row::reset(bool DefaultIsStmt) {
   Address.Address = 0;
   Address.SectionIndex = object::SectionedAddress::UndefSection;
   Line = 1;
   Column = 0;
   File = 1;
   Isa = 0;
   Discriminator = 0;
   IsStmt = DefaultIsStmt;
+  OpIndex = 0;
   BasicBlock = false;
   EndSequence = false;
   PrologueEnd = false;
   EpilogueBegin = false;
 }
 
 void DWARFDebugLine::Row::dumpTableHeader(raw_ostream &OS, unsigned Indent) {
   OS.indent(Indent)
-      << "Address            Line   Column File   ISA Discriminator Flags\n";
+      << "Address            Line   Column File   ISA Discriminator OpIndex "
+         "Flags\n";
   OS.indent(Indent)
-      << "------------------ ------ ------ ------ --- ------------- "
+      << "------------------ ------ ------ ------ --- ------------- ------- "
          "-------------\n";
 }
 
 void DWARFDebugLine::Row::dump(raw_ostream &OS) const {
   OS << format("0x%16.16" PRIx64 " %6u %6u", Address.Address, Line, Column)
-     << format(" %6u %3u %13u ", File, Isa, Discriminator)
+     << format(" %6u %3u %13u %7u ", File, Isa, Discriminator, OpIndex)
      << (IsStmt ? " is_stmt" : "") << (BasicBlock ? " basic_block" : "")
      << (PrologueEnd ? " prologue_end" : "")
      << (EpilogueBegin ? " epilogue_begin" : "")
      << (EndSequence ? " end_sequence" : "") << '\n';
 }
 
 DWARFDebugLine::Sequence::Sequence() { reset(); }
 

llvm/test/CodeGen/AMDGPU/prologue-epilogue-markers.ll

 ; CHECK-NEXT:    s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
 ; CHECK-NEXT:  .Ltmp0:
 ; CHECK-NEXT:    .loc 0 7 3 prologue_end ; file.cpp:7:3
 ; CHECK-NEXT:    s_setpc_b64 s[30:31]
 ; CHECK-NEXT:  .Ltmp1:
 
 ; DWARFLINE:    file format elf64-amdgpu
 ; DWARFLINE:    .debug_line contents
-; DWARFLINE:    Address            Line   Column File   ISA Discriminator Flags
-; DWARFLINE:    0x0000000000000000      5      0      0   0             0  is_stmt
-; DWARFLINE-NEXT: 0x0000000000000004      7      3      0   0             0  is_stmt prologue_end
-; DWARFLINE-NEXT: 0x0000000000000008      7      3      0   0             0  is_stmt end_sequence
+; DWARFLINE:    Address            Line   Column File   ISA Discriminator OpIndex Flags
+; DWARFLINE:    0x0000000000000000      5      0      0   0             0       0  is_stmt
+; DWARFLINE-NEXT: 0x0000000000000004      7      3      0   0             0       0  is_stmt prologue_end
+; DWARFLINE-NEXT: 0x0000000000000008      7      3      0   0             0       0  is_stmt end_sequence
 
 entry:
   ret void, !dbg !7
 }
 
 attributes #0 = { nounwind }
 
 !llvm.dbg.cu = !{!0}

llvm/test/DebugInfo/CSKY/dwarf-csky-relocs.ll

 ; DWARF-DUMP-NEXT: standard_opcode_lengths[DW_LNS_set_isa] = 1
 ; DWARF-DUMP-NEXT: include_directories[  0] = "."
 ; DWARF-DUMP-NEXT: file_names[  0]:
 ; DWARF-DUMP-NEXT:            name: "dwarf-csky-relocs.c"
 ; DWARF-DUMP-NEXT:       dir_index: 0
 ; DWARF-DUMP-NEXT:    md5_checksum: ba6dbc7dc09162edb18beacd8474bcd3
 ; DWARF-DUMP-NEXT:          source: "int main()\n{\n    return 0;\n}\n"
 ; DWARF-DUMP-EMPTY:
-; DWARF-DUMP-NEXT: Address            Line   Column File   ISA Discriminator Flags
-; DWARF-DUMP-NEXT: ------------------ ------ ------ ------ --- ------------- -------------
-; DWARF-DUMP-NEXT: 0x0000000000000000      2      0      0   0             0  is_stmt
-; DWARF-DUMP-NEXT: 0x000000000000000e      3      3      0   0             0  is_stmt prologue_end
-; DWARF-DUMP-NEXT: 0x0000000000000016      3      3      0   0             0  epilogue_begin
-; DWARF-DUMP-NEXT: 0x000000000000001a      3      3      0   0             0  end_sequence
+; DWARF-DUMP-NEXT: Address            Line   Column File   ISA Discriminator OpIndex Flags
+; DWARF-DUMP-NEXT: ------------------ ------ ------ ------ --- ------------- ------- -------------
+; DWARF-DUMP-NEXT: 0x0000000000000000      2      0      0   0             0       0  is_stmt
+; DWARF-DUMP-NEXT: 0x000000000000000e      3      3      0   0             0       0  is_stmt prologue_end
+; DWARF-DUMP-NEXT: 0x0000000000000016      3      3      0   0             0       0  epilogue_begin
+; DWARF-DUMP-NEXT: 0x000000000000001a      3      3      0   0             0       0  end_sequence
 
 ; ModuleID = 'dwarf-csky-relocs.c'
 source_filename = "dwarf-csky-relocs.c"
 target datalayout = "e-m:e-S32-p:32:32-i32:32:32-i64:32:32-f32:32:32-f64:32:32-v64:32:32-v128:32:32-a:0:32-Fi32-n32"
 target triple = "csky-unknown-linux"
 
 ; Function Attrs: noinline nounwind optnone
 define dso_local i32 @main() #0 !dbg !9 {

llvm/test/DebugInfo/Generic/multiline.ll

 ; CHECK: .loc 1 4 9 is_stmt 0{{$}}
 ; CHECK-NOT: .loc
 ; CHECK: .loc 1 4 15{{$}}
 ; CHECK-NOT: .loc
 ; CHECK: .loc 1 5 1 {{(epilogue_begin )?}}is_stmt 1{{$}}
 
 ; INT: {{^}}Address
 ; INT: -----
-; INT:      3 3 1 0 0 is_stmt prologue_end{{$}}
-; INT-NEXT: 3 9 1 0 0 {{$}}
-; INT-NEXT: 3 15 1 0 0 {{$}}
-; INT-NEXT: 4 3 1 0 0 is_stmt{{$}}
-; INT-NEXT: 4 9 1 0 0 {{$}}
-; INT-NEXT: 4 15 1 0 0 {{$}}
-; INT-NEXT: 5 1 1 0 0 is_stmt{{( epilogue_begin)?}}{{$}}
+; INT:      3 3 1 0 0 0 is_stmt prologue_end{{$}}
+; INT-NEXT: 3 9 1 0 0 0 {{$}}
+; INT-NEXT: 3 15 1 0 0 0 {{$}}
+; INT-NEXT: 4 3 1 0 0 0 is_stmt{{$}}
+; INT-NEXT: 4 9 1 0 0 0 {{$}}
+; INT-NEXT: 4 15 1 0 0 0 {{$}}
+; INT-NEXT: 5 1 1 0 0 0 is_stmt{{( epilogue_begin)?}}{{$}}
 
 
 ; Function Attrs: nounwind uwtable
 define void @f2() #0 !dbg !4 {
 entry:
   call void (...) @f1(), !dbg !11
   call void (...) @f1(), !dbg !12
   call void (...) @f1(), !dbg !13

llvm/test/DebugInfo/Generic/unconditional-branch.ll

 ; PR 19261
 
 ; RUN: %llc_dwarf -fast-isel=false -O0 -filetype=obj %s -o %t
 ; RUN: llvm-dwarfdump -a %t | FileCheck %s
 
-; CHECK: {{0x[0-9a-f]+}}      1      0      1   0             0  is_stmt
-; CHECK: {{0x[0-9a-f]+}}      2      0      1   0             0  is_stmt
-; CHECK: {{0x[0-9a-f]+}}      4      0      1   0             0  is_stmt
+; CHECK: {{0x[0-9a-f]+}}      1      0      1   0             0       0  is_stmt
+; CHECK: {{0x[0-9a-f]+}}      2      0      1   0             0       0  is_stmt
+; CHECK: {{0x[0-9a-f]+}}      4      0      1   0             0       0  is_stmt
 
 ; IR generated from clang -O0 -g with the following source:
 ;void foo(int i){
 ;  switch(i){
 ;  default:
 ;    break;
 ;  }
 ;  return;

llvm/test/DebugInfo/MIR/X86/empty-inline.mir

 # RUN: llc -verify-machineinstrs -start-after=virtregrewriter -filetype=obj -o - %s | llvm-dwarfdump -a - | FileCheck %s
 #
 # This testcase has an implicit def pseudo-instruction with a debug location.
 #
 # CHECK: .debug_info contents:
 # CHECK: DW_TAG_subprogram
 # CHECK:  DW_AT_low_pc (0x0000000000000000)
 # CHECK-NOT: DW_TAG
 # CHECK:  DW_AT_specification {{.*}} "_ZN1C5m_fn3Ev"
 # CHECK-NOT: DW_TAG
 #      Here should not be an inlined subroutine with 0 length.
 # CHECK: NULL
 #
-# CHECK: Address            Line   Column File   ISA Discriminator Flags
+# CHECK: Address            Line   Column File   ISA Discriminator OpIndex Flags
 # CHECK-NEXT:                ---
-# CHECK-NEXT:                 25      0      1   0             0  is_stmt
-# CHECK-NEXT:                 29     28      1   0             0  is_stmt prologue_end
-# CHECK-NEXT:                 29     28      1   0             0  is_stmt end_sequence
+# CHECK-NEXT:                 25      0      1   0             0         0 is_stmt
+# CHECK-NEXT:                 29     28      1   0             0         0 is_stmt prologue_end
+# CHECK-NEXT:                 29     28      1   0             0         0 is_stmt end_sequence
 --- |
   source_filename = "t.ll"
   target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
   target triple = "x86_64-apple-macosx"
 
   %class.E = type { %class.D }
   %class.D = type { %class.B }
   %class.B = type { %class.A, %class.A }

llvm/test/DebugInfo/Mips/delay-slot.ll

 ; RUN: llc -filetype=obj -O0 -relocation-model=pic < %s -mtriple mips-unknown-linux-gnu | llvm-dwarfdump -a - | FileCheck %s
 ; PR19815
 
 ; Generated using clang -target mips-linux-gnu -g test.c -S -o - -flto|opt -passes=sroa -S
 ; test.c:
 ;
 ; int foo(int x) {
 ;  if (x)
 ;    return 0;
 ;  return 1;
 ; }
 
-; CHECK: Address            Line   Column File   ISA Discriminator Flags
-; CHECK: ------------------ ------ ------ ------ --- ------------- -------------
-; CHECK: 0x0000000000000000      1      0      1   0             0  is_stmt
-; CHECK: 0x0000000000000004      2      0      1   0             0  is_stmt prologue_end
-; CHECK: 0x0000000000000020      3      0      1   0             0  is_stmt
-; CHECK: 0x0000000000000030      4      0      1   0             0  is_stmt
+; CHECK: Address            Line   Column File   ISA Discriminator OpIndex Flags
+; CHECK: ------------------ ------ ------ ------ --- ------------- ------- -------------
+; CHECK: 0x0000000000000000      1      0      1   0             0       0  is_stmt
+; CHECK: 0x0000000000000004      2      0      1   0             0       0  is_stmt prologue_end
+; CHECK: 0x0000000000000020      3      0      1   0             0       0  is_stmt
+; CHECK: 0x0000000000000030      4      0      1   0             0       0  is_stmt
 ; CHECK: 0x0000000000000040      0      0      1   0             0
-; CHECK: 0x0000000000000048      5      0      1   0             0  is_stmt
-; CHECK: 0x0000000000000050      5      0      1   0             0  is_stmt end_sequence
+; CHECK: 0x0000000000000048      5      0      1   0             0       0  is_stmt
+; CHECK: 0x0000000000000050      5      0      1   0             0       0  is_stmt end_sequence
 
 
 target datalayout = "E-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64"
 target triple = "mips--linux-gnu"
 
 ; Function Attrs: nounwind
 define i32 @foo(i32 %x) #0 !dbg !4 {
 entry:

llvm/test/DebugInfo/Mips/fn-call-line.ll

 ; CHECK: %call16(f1) 
 ; CHECK-NOT: .loc
 ; CHECK: .loc 1 4 3
 ; CHECK-NOT: .loc
 ; CHECK: %call16(f1) 
 
 ; INT: {{^}}Address
 ; INT: -----
-; INT-NEXT: 2 0 1 0 0 is_stmt{{$}}
-; INT-NEXT: 3 3 1 0 0 is_stmt prologue_end{{$}}
-; INT-NEXT: 4 3 1 0 0 is_stmt{{$}}
+; INT-NEXT: 2 0 1 0 0 0 is_stmt{{$}}
+; INT-NEXT: 3 3 1 0 0 0 is_stmt prologue_end{{$}}
+; INT-NEXT: 4 3 1 0 0 0 is_stmt{{$}}
 
 
 ; Function Attrs: nounwind uwtable
 define void @f2() #0 !dbg !4 {
 entry:
   call void (...) @f1(), !dbg !11
   call void (...) @f1(), !dbg !12
   ret void, !dbg !13

llvm/test/DebugInfo/RISCV/dwarf-riscv-relocs.ll

 ; DWARF-DUMP-NEXT: standard_opcode_lengths[DW_LNS_set_isa] = 1
 ; DWARF-DUMP-NEXT: include_directories[  0] = "."
 ; DWARF-DUMP-NEXT: file_names[  0]:
 ; DWARF-DUMP-NEXT:            name: "dwarf-riscv-relocs.c"
 ; DWARF-DUMP-NEXT:       dir_index: 0
 ; DWARF-DUMP-NEXT:    md5_checksum: 05ab89f5481bc9f2d037e7886641e919
 ; DWARF-DUMP-NEXT:          source: "int main()\n{\n    return 0;\n}\n"
 ; DWARF-DUMP-EMPTY:
-; DWARF-DUMP-NEXT: Address            Line   Column File   ISA Discriminator Flags
-; DWARF-DUMP-NEXT: ------------------ ------ ------ ------ --- ------------- -------------
-; DWARF-DUMP-NEXT: 0x0000000000000000      2      0      0   0             0  is_stmt
-; DWARF-DUMP-NEXT: 0x0000000000000014      3      5      0   0             0  is_stmt prologue_end
-; DWARF-DUMP-NEXT: 0x0000000000000020      3      5      0   0             0  epilogue_begin
-; DWARF-DUMP-NEXT: 0x0000000000000028      3      5      0   0             0  end_sequence
+; DWARF-DUMP-NEXT: Address            Line   Column File   ISA Discriminator OpIndex Flags
+; DWARF-DUMP-NEXT: ------------------ ------ ------ ------ --- ------------- ------- -------------
+; DWARF-DUMP-NEXT: 0x0000000000000000      2      0      0   0             0       0  is_stmt
+; DWARF-DUMP-NEXT: 0x0000000000000014      3      5      0   0             0       0  is_stmt prologue_end
+; DWARF-DUMP-NEXT: 0x0000000000000020      3      5      0   0             0       0  epilogue_begin
+; DWARF-DUMP-NEXT: 0x0000000000000028      3      5      0   0             0       0  end_sequence
 
 ; ModuleID = 'dwarf-riscv-relocs.c'
 source_filename = "dwarf-riscv-relocs.c"
 target datalayout = "e-m:e-p:32:32-i64:64-n32-S128"
 target triple = "riscv32"
 
 ; Function Attrs: noinline nounwind optnone
 define dso_local i32 @main() #0 !dbg !7 {

llvm/test/DebugInfo/X86/basic-block-sections_1.ll

 ; BB-SECTIONS-ASM-NEXT: .quad _Z3fooi.__part.2
 ; BB-SECTIONS-ASM-NEXT: .quad .LBB_END0_{{[0-9]+}}
 ; BB-SECTIONS-ASM-NEXT: .quad _Z3fooi.__part.3
 ; BB-SECTIONS-ASM-NEXT: .quad .LBB_END0_{{[0-9]+}}
 ; BB-SECTIONS-ASM-NEXT: .quad .Lfunc_begin0
 ; BB-SECTIONS-ASM-NEXT: .quad .Lfunc_end0
 ; BB-SECTIONS-ASM-NEXT: .quad 0
 ; BB-SECTIONS-ASM-NEXT: .quad 0
-; BB-SECTIONS-LINE-TABLE:      0x0000000000000000 1 0 1 0 0 is_stmt
-; BB-SECTIONS-LINE-TABLE-NEXT: 0x0000000000000004 2 9 1 0 0 is_stmt prologue_end
-; BB-SECTIONS-LINE-TABLE-NEXT: 0x0000000000000008 2 7 1 0 0
-; BB-SECTIONS-LINE-TABLE-NEXT: 0x000000000000000a 0 7 1 0 0
-; BB-SECTIONS-LINE-TABLE-NEXT: 0x000000000000000f 3 5 1 0 0 is_stmt
-; BB-SECTIONS-LINE-TABLE-NEXT: 0x0000000000000015 0 5 1 0 0
-; BB-SECTIONS-LINE-TABLE-NEXT: 0x000000000000001a 5 5 1 0 0 is_stmt
-; BB-SECTIONS-LINE-TABLE-NEXT: 0x000000000000001e 6 1 1 0 0 is_stmt
-; BB-SECTIONS-LINE-TABLE-NEXT: 0x0000000000000022 6 1 1 0 0 epilogue_begin
-; BB-SECTIONS-LINE-TABLE-NEXT: 0x0000000000000024 6 1 1 0 0 end_sequence
+; BB-SECTIONS-LINE-TABLE:      0x0000000000000000 1 0 1 0 0 0 is_stmt
+; BB-SECTIONS-LINE-TABLE-NEXT: 0x0000000000000004 2 9 1 0 0 0 is_stmt prologue_end
+; BB-SECTIONS-LINE-TABLE-NEXT: 0x0000000000000008 2 7 1 0 0 0
+; BB-SECTIONS-LINE-TABLE-NEXT: 0x000000000000000a 0 7 1 0 0 0
+; BB-SECTIONS-LINE-TABLE-NEXT: 0x000000000000000f 3 5 1 0 0 0 is_stmt
+; BB-SECTIONS-LINE-TABLE-NEXT: 0x0000000000000015 0 5 1 0 0 0
+; BB-SECTIONS-LINE-TABLE-NEXT: 0x000000000000001a 5 5 1 0 0 0 is_stmt
+; BB-SECTIONS-LINE-TABLE-NEXT: 0x000000000000001e 6 1 1 0 0 0 is_stmt
+; BB-SECTIONS-LINE-TABLE-NEXT: 0x0000000000000022 6 1 1 0 0 0 epilogue_begin
+; BB-SECTIONS-LINE-TABLE-NEXT: 0x0000000000000024 6 1 1 0 0 0 end_sequence
 
 ; Function Attrs: noinline nounwind optnone uwtable
 define dso_local i32 @_Z3fooi(i32 %0) !dbg !7 !prof !34 !section_prefix !35 {
   %2 = alloca i32, align 4
   %3 = alloca i32, align 4
   store i32 %0, ptr %3, align 4
   call void @llvm.dbg.declare(metadata ptr %3, metadata !11, metadata !DIExpression()), !dbg !12
   %4 = load i32, ptr %3, align 4, !dbg !13

llvm/test/DebugInfo/X86/discriminator.ll

 !9 = !{!"clang version 3.5 "}
 !10 = !DILocation(line: 2, scope: !11)
 !11 = distinct !DILexicalBlock(line: 2, column: 0, file: !1, scope: !4)
 !12 = !DILocation(line: 3, scope: !4)
 !13 = !DILocation(line: 4, scope: !4)
 !14 = !DILocation(line: 2, scope: !15)
 !15 = !DILexicalBlockFile(discriminator: 42, file: !1, scope: !4)
 
-; CHECK: Address            Line   Column File   ISA Discriminator Flags
-; CHECK: ------------------ ------ ------ ------ --- ------------- -------------
-; CHECK: 0x000000000000000a      2      0      1   0            42 {{$}}
+; CHECK: Address            Line   Column File   ISA Discriminator OpIndex Flags
+; CHECK: ------------------ ------ ------ ------ --- ------------- ------- -------------
+; CHECK: 0x000000000000000a      2      0      1   0            42       0 {{$}}

llvm/test/DebugInfo/X86/discriminator2.ll

 !8 = !{null}
 !9 = !DILocation(line: 4, column: 7, scope: !6)
 !10 = !DILocation(line: 5, column: 14, scope: !6)
 !11 = !DILocation(line: 4, column: 3, scope: !12)
 !12 = !DILexicalBlockFile(scope: !6, file: !1, discriminator: 1)
 !13 = !DILocation(line: 5, column: 21, scope: !12)
 !14 = !DILocation(line: 6, column: 1, scope: !6)
 
-; CHECK: Address            Line   Column File   ISA Discriminator Flags
-; CHECK: ------------------ ------ ------ ------ --- ------------- -------------
-; CHECK: {{.*}}      4      3      1   0             1  {{.*}}
-; CHECK: {{.*}}      5     21      1   0             1  {{.*}}
+; CHECK: Address            Line   Column File   ISA Discriminator OpIndex Flags
+; CHECK: ------------------ ------ ------ ------ --- ------------- ------- -------------
+; CHECK: {{.*}}                  4      3      1   0             1       0 {{.*}}
+; CHECK: {{.*}}                  5     21      1   0             1       0 {{.*}}

llvm/test/DebugInfo/X86/discriminator3.ll

 !16 = !DILocation(line: 3, column: 15, scope: !17)
 !17 = !DILexicalBlockFile(scope: !18, file: !1, discriminator: 1)
 !18 = distinct !DILexicalBlock(scope: !14, file: !1, line: 3, column: 10)
 !19 = !DILocation(line: 3, column: 16, scope: !17)
 !20 = !DILocation(line: 3, column: 11, scope: !17)
 !21 = !DILocation(line: 3, column: 21, scope: !17)
 !22 = !DILocation(line: 4, column: 1, scope: !6)
 
-; CHECK: Address            Line   Column File   ISA Discriminator Flags
-; CHECK: ------------------ ------ ------ ------ --- ------------- -------------
-; CHECK: {{.*}}      3     15      1   0             1 
-; CHECK: {{.*}}      3     16      1   0             1 
-; CHECK: {{.*}}      3     11      1   0             1 
+; CHECK: Address            Line   Column File   ISA Discriminator OpIndex Flags
+; CHECK: ------------------ ------ ------ ------ --- ------------- ------- -------------
+; CHECK: {{.*}}                  3     15      1   0             1       0
+; CHECK: {{.*}}                  3     16      1   0             1       0
+; CHECK: {{.*}}                  3     11      1   0             1       0

llvm/test/DebugInfo/X86/ending-run.ll

 ; RUN: llc -mtriple=x86_64-apple-darwin -filetype=obj %s -o %t
 ; RUN: llvm-dwarfdump -debug-line %t | FileCheck %s
 
 ; Check that the line table starts at 7, not 4, but that the first
 ; statement isn't until line 8.
 
-; CHECK-NOT: 0x0000000000000000      7      0      1   0  0  is_stmt
+; CHECK-NOT: 0x0000000000000000      7      0      1   0  0       0  is_stmt
 ; CHECK: 0x0000000000000000      7      0      1   0
-; CHECK: 0x0000000000000004      8     18      1   0  0  is_stmt prologue_end
+; CHECK: 0x0000000000000004      8     18      1   0  0       0  is_stmt prologue_end
 
 define i32 @callee(i32 %x) nounwind uwtable ssp !dbg !5 {
 entry:
   %x.addr = alloca i32, align 4
   %y = alloca i32, align 4
   store i32 %x, ptr %x.addr, align 4
   call void @llvm.dbg.declare(metadata ptr %x.addr, metadata !12, metadata !DIExpression()), !dbg !13
   call void @llvm.dbg.declare(metadata ptr %y, metadata !14, metadata !DIExpression()), !dbg !16

llvm/test/DebugInfo/X86/line-info.ll

 ; RUN: llc -mtriple=x86_64-apple-darwin -filetype=obj -O0 < %s > %t
 ; RUN: llvm-dwarfdump -v %t | FileCheck %s
 
 ; CHECK: [[FILEID:[0-9]+]]]{{.*}}list0.h
-; CHECK: [[FILEID]]      0      1   0  0 is_stmt{{$}}
+; CHECK: [[FILEID]]      0      1   0  0 0 is_stmt{{$}}
 
 ; IR generated from clang -g -emit-llvm with the following source:
 ; list0.h:
 ; int foo (int x) {
 ;     return ++x;
 ; }
 ; list0.c:
 ; #include "list0.h"

llvm/test/DebugInfo/X86/multiple-epilogue.ll

 ; LINE-TABLE: Line table prologue:
 ; LINE-TABLE:     total_length: 0x00000069
 ; LINE-TABLE:           format: DWARF32
 ; LINE-TABLE:          version: 5
 ; LINE-TABLE:     address_size: 8
 ; LINE-TABLE:  seg_select_size: 0
 ; LINE-TABLE:  prologue_length: 0x00000037
 
-; LINE-TABLE:      Address            Line   Column File   ISA Discriminator Flags
-; LINE-TABLE-NEXT: ------------------ ------ ------ ------ --- ------------- -------------
-; LINE-TABLE-NEXT: 0x0000000000000000      4      0      0   0             0  is_stmt
-; LINE-TABLE-NEXT: 0x0000000000000001      5      9      0   0             0  is_stmt prologue_end
-; LINE-TABLE-NEXT: 0x0000000000000004      5      7      0   0             0 
-; LINE-TABLE-NEXT: 0x0000000000000006      6     12      0   0             0  is_stmt
-; LINE-TABLE-NEXT: 0x000000000000000b      9      1      0   0             0  is_stmt epilogue_begin
-; LINE-TABLE-NEXT: 0x000000000000000d      8     12      0   0             0  is_stmt
-; LINE-TABLE-NEXT: 0x0000000000000012      9      1      0   0             0  is_stmt epilogue_begin
-; LINE-TABLE-NEXT: 0x0000000000000014      9      1      0   0             0  is_stmt end_sequence
+; LINE-TABLE:      Address            Line   Column File   ISA Discriminator OpIndex Flags
+; LINE-TABLE-NEXT: ------------------ ------ ------ ------ --- ------------- ------- -------------
+; LINE-TABLE-NEXT: 0x0000000000000000      4      0      0   0             0       0  is_stmt
+; LINE-TABLE-NEXT: 0x0000000000000001      5      9      0   0             0       0  is_stmt prologue_end
+; LINE-TABLE-NEXT: 0x0000000000000004      5      7      0   0             0       0
+; LINE-TABLE-NEXT: 0x0000000000000006      6     12      0   0             0       0  is_stmt
+; LINE-TABLE-NEXT: 0x000000000000000b      9      1      0   0             0       0  is_stmt epilogue_begin
+; LINE-TABLE-NEXT: 0x000000000000000d      8     12      0   0             0       0  is_stmt
+; LINE-TABLE-NEXT: 0x0000000000000012      9      1      0   0             0       0  is_stmt epilogue_begin
+; LINE-TABLE-NEXT: 0x0000000000000014      9      1      0   0             0       0  is_stmt end_sequence
 
 
 
 
 ; Function Attrs: mustprogress uwtable
 define dso_local noundef i32 @_Z3fooi(i32 noundef %a) local_unnamed_addr #0 !dbg !8 {
 entry:
   call void @llvm.dbg.value(metadata i32 %a, metadata !13, metadata !DIExpression()), !dbg !14

llvm/test/DebugInfo/XCOFF/empty-prolog.ll

 
 ; RUN: llc -mtriple powerpc-ibm-aix-xcoff -filetype=obj -o %t %s 
 ; RUN: llvm-dwarfdump -debug-line %t | FileCheck %s
 
-; CHECK:        Address            Line   Column File   ISA Discriminator Flags
-; CHECK-NEXT:   ------------------ ------ ------ ------ --- ------------- -------------
-; CHECK-NEXT:   0x0000000000000000      3      0      1   0             0  is_stmt prologue_end
-; CHECK-NEXT:   0x000000000000001c      3      0      1   0             0  is_stmt end_sequence
+; CHECK:        Address            Line   Column File   ISA Discriminator OpIndex Flags
+; CHECK-NEXT:   ------------------ ------ ------ ------ --- ------------- ------- -------------
+; CHECK-NEXT:   0x0000000000000000      3      0      1   0             0       0  is_stmt prologue_end
+; CHECK-NEXT:   0x000000000000001c      3      0      1   0             0       0  is_stmt end_sequence
 
 define i32 @main() !dbg !7 {
 entry:
   ret i32 0, !dbg !12
 }
 
 !llvm.dbg.cu = !{!0}
 !llvm.module.flags = !{!2, !3, !4, !5}

llvm/test/DebugInfo/XCOFF/empty.ll

 ; DWARF32-NEXT:  standard_opcode_lengths[DW_LNS_set_prologue_end] = 0
 ; DWARF32-NEXT:  standard_opcode_lengths[DW_LNS_set_epilogue_begin] = 0
 ; DWARF32-NEXT:  standard_opcode_lengths[DW_LNS_set_isa] = 1
 ; DWARF32-NEXT:  file_names[  1]:
 ; DWARF32-NEXT:             name: "1.c"
 ; DWARF32-NEXT:        dir_index: 0
 ; DWARF32-NEXT:         mod_time: 0x00000000
 ; DWARF32-NEXT:           length: 0x00000000
-; DWARF32:       Address            Line   Column File   ISA Discriminator Flags
-; DWARF32-NEXT:  ------------------ ------ ------ ------ --- ------------- -------------
-; DWARF32-NEXT:  0x0000000000000000      2      0      1   0             0  is_stmt
-; DWARF32-NEXT:  0x0000000000000004      3      3      1   0             0  is_stmt prologue_end
-; DWARF32-NEXT:  0x0000000000000024      3      3      1   0             0  is_stmt end_sequence
+; DWARF32:       Address            Line   Column File   ISA Discriminator OpIndex Flags
+; DWARF32-NEXT:  ------------------ ------ ------ ------ --- ------------- ------- -------------
+; DWARF32-NEXT:  0x0000000000000000      2      0      1   0             0       0  is_stmt
+; DWARF32-NEXT:  0x0000000000000004      3      3      1   0             0       0  is_stmt prologue_end
+; DWARF32-NEXT:  0x0000000000000024      3      3      1   0             0       0  is_stmt end_sequence

llvm/test/Linker/subprogram-linkonce-weak.ll

 ; DWWL:         DW_TAG_inlined_subroutine
 ; DWWL:           DW_AT_abstract_origin
 
 ; DW-LABEL:   .debug_line contents:
 ; Check that we have the right things in the line table as well.
 
 ; DWLW-LABEL: file_names[ 1]:
 ; DWLW-NEXT: name: "bar.c"
-; DWLW:        2 0 1 0 0 is_stmt prologue_end
+; DWLW:        2 0 1 0 0 0 is_stmt prologue_end
 ; DWLW-LABEL: file_names[ 1]:
 ; DWLW-NEXT: name: "foo.c"
-; DWLW:       52 0 1 0 0 is_stmt prologue_end
-; DWLW-NOT:                      prologue_end
+; DWLW:       52 0 1 0 0 0 is_stmt prologue_end
+; DWLW-NOT:                        prologue_end
 
 ; DWWL-LABEL: file_names[ 1]:
 ; DWWL-NEXT: name: "foo.c"
-; DWWL:       52 0 1 0 0 is_stmt prologue_end
+; DWWL:       52 0 1 0 0 0 is_stmt prologue_end
 ; DWWL-LABEL: file_names[ 1]:
 ; DWWL-NEXT: name: "bar.c"
-; DWWL:        2 0 1 0 0 is_stmt prologue_end
-; DWWL-NOT:                      prologue_end
+; DWWL:        2 0 1 0 0 0 is_stmt prologue_end
+; DWWL-NOT:                        prologue_end

llvm/test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s

 
 
 // DWARF: .debug_aranges contents:
 // DWARF-NEXT: Address Range Header: length = 0x00000024, format = DWARF32, version = 0x0002, cu_offset = 0x00000000, addr_size = 0x04, seg_size = 0x00
 // DWARF-NEXT: [0x00000000, 0x00000004)
 // DWARF-NEXT: [0x00000000, 0x00000004)
 
 // DWARF: .debug_line contents:
-// DWARF:      0x0000000000000000      7      0      1   0   0 is_stmt
-// DWARF-NEXT: 0x0000000000000004      7      0      1   0   0 is_stmt end_sequence
-// DWARF:      0x0000000000000000     11      0      1   0   0 is_stmt
-// DWARF-NEXT: 0x0000000000000004     11      0      1   0   0 is_stmt end_sequence
+// DWARF:      0x0000000000000000      7      0      1   0   0 0 is_stmt
+// DWARF-NEXT: 0x0000000000000004      7      0      1   0   0 0 is_stmt end_sequence
+// DWARF:      0x0000000000000000     11      0      1   0   0 0 is_stmt
+// DWARF-NEXT: 0x0000000000000004     11      0      1   0   0 0 is_stmt end_sequence
 
 
 // DWARF-NOT: .debug_ranges contents:
 // DWARF-NOT: .debug_pubnames contents:
 
 
 // RELOC: RELOCATION RECORDS FOR [.debug_info]:
 // RELOC-NEXT: OFFSET TYPE VALUE

llvm/test/MC/ARM/dwarf-asm-multiple-sections.s

 
 
 // DWARF-DL: .debug_line contents:
 // DWARF-DL: version: [[DWVER]]
 // DWARF-DL-5:    address_size: 4
 // DWARF-DL-5:    include_directories[  0] = "/tmp"
 // DWARF-DL:      file_names[  [[DWFILE]]]:
 // DWARF-DL:      name: "{{(<stdin>|-)}}"
-// DWARF-DL-5:      0x0000000000000000     17      0      0   0   0  is_stmt
-// DWARF-DL-5-NEXT: 0x0000000000000004     17      0      0   0   0  is_stmt end_sequence
-// DWARF-DL-5-NEXT: 0x0000000000000000     21      0      0   0   0  is_stmt
-// DWARF-DL-5-NEXT: 0x0000000000000004     21      0      0   0   0  is_stmt end_sequence
-// DWARF-DL-3:      0x0000000000000000     17      0      1   0   0  is_stmt
-// DWARF-DL-3-NEXT: 0x0000000000000004     17      0      1   0   0  is_stmt end_sequence
-// DWARF-DL-3-NEXT: 0x0000000000000000     21      0      1   0   0  is_stmt
-// DWARF-DL-3-NEXT: 0x0000000000000004     21      0      1   0   0  is_stmt end_sequence
+// DWARF-DL-5:      0x0000000000000000     17      0      0   0   0       0  is_stmt
+// DWARF-DL-5-NEXT: 0x0000000000000004     17      0      0   0   0       0  is_stmt end_sequence
+// DWARF-DL-5-NEXT: 0x0000000000000000     21      0      0   0   0       0  is_stmt
+// DWARF-DL-5-NEXT: 0x0000000000000004     21      0      0   0   0       0  is_stmt end_sequence
+// DWARF-DL-3:      0x0000000000000000     17      0      1   0   0       0  is_stmt
+// DWARF-DL-3-NEXT: 0x0000000000000004     17      0      1   0   0       0  is_stmt end_sequence
+// DWARF-DL-3-NEXT: 0x0000000000000000     21      0      1   0   0       0  is_stmt
+// DWARF-DL-3-NEXT: 0x0000000000000004     21      0      1   0   0       0  is_stmt end_sequence
 // DWARF-DL-EMPTY:
 
 
 // DWARF34:      .debug_ranges contents:
 // DWARF34-NEXT: 00000000 ffffffff 00000000
 // DWARF34-NEXT: 00000000 00000000 00000004
 // DWARF34-NEXT: 00000000 ffffffff 00000000
 // DWARF34-NEXT: 00000000 00000000 00000004

llvm/test/MC/ARM/dwarf-asm-nonstandard-section.s

 
 
 // DWARF: .debug_aranges contents:
 // DWARF-NEXT: Address Range Header: length = 0x0000001c, format = DWARF32, version = 0x0002, cu_offset = 0x00000000, addr_size = 0x04, seg_size = 0x00
 // DWARF-NEXT: [0x00000000, 0x00000004)
 
 
 // DWARF: .debug_line contents:
-// DWARF:      0x0000000000000000      7      0      1   0   0  is_stmt
-// DWARF-NEXT: 0x0000000000000004      7      0      1   0   0  is_stmt end_sequence
+// DWARF:      0x0000000000000000      7      0      1   0   0       0  is_stmt
+// DWARF-NEXT: 0x0000000000000004      7      0      1   0   0       0  is_stmt end_sequence
 
 
 // DWARF-NOT: .debug_ranges contents:
 // DWARF-NOT: .debug_pubnames contents:
 
 
 
 // RELOC: RELOCATION RECORDS FOR [.debug_info]:

llvm/test/MC/ARM/dwarf-asm-single-section.s

 // DWARF-NEXT: DW_AT_name ("a")
 
 
 // DWARF: .debug_aranges contents:
 // DWARF-NEXT: Address Range Header: length = 0x0000001c, format = DWARF32, version = 0x0002, cu_offset = 0x00000000, addr_size = 0x04, seg_size = 0x00
 // DWARF-NEXT: [0x00000000, 0x00000004)
 
 // DWARF: .debug_line contents:
-// DWARF:      0x0000000000000000      7      0      1   0   0 is_stmt
-// DWARF-NEXT: 0x0000000000000004      7      0      1   0   0 is_stmt end_sequence
+// DWARF:      0x0000000000000000      7      0      1   0   0 0 is_stmt
+// DWARF-NEXT: 0x0000000000000004      7      0      1   0   0 0 is_stmt end_sequence
 
 
 // DWARF-NOT: .debug_ranges contents:
 // DWARF-NOT: .debug_pubnames contents:
 
 
 // RELOC: RELOCATION RECORDS FOR [.debug_info]:
 // RELOC-NEXT: OFFSET TYPE VALUE

llvm/test/MC/AsmParser/directive_file-g.s

 # CHECK: .debug_info
 ## gcc does generate a DW_TAG_compile_unit in this case, with or without
 ## -g on the command line, but we do not.
 # CHECK-EMPTY:
 # CHECK-NEXT: .debug_line
 # CHECK: file_names[ 1]:
 # CHECK-NEXT: name: "a.c"
 # CHECK-NEXT: dir_index: 0
-# CHECK: 0x{{0+}}0 1 1 1 0 0 is_stmt
-# CHECK: 0x{{0+}}1 1 1 1 0 0 is_stmt end_sequence
+# CHECK: 0x{{0+}}0 1 1 1 0 0 0 is_stmt
+# CHECK: 0x{{0+}}1 1 1 1 0 0 0 is_stmt end_sequence

llvm/test/MC/AsmParser/directive_loc_2.s

# RUN: llvm-dwarfdump -debug-line %t | FileCheck %s
         nop
         .loc 1 10
         nop
 
 # CHECK: .debug_line
 # CHECK: file_names[ 1]:
 # CHECK-NEXT: name: "test.c"
 # CHECK-NEXT: dir_index: 0
-# CHECK: 0x{{0+}}0 2 0 1 0 0 is_stmt
-# CHECK: 0x{{0+}}1 4 0 1 0 0 {{$}}
-# CHECK: 0x{{0+}}2 6 0 1 0 0 {{$}}
-# CHECK: 0x{{0+}}3 8 0 1 0 0 is_stmt
-# CHECK: 0x{{0+}}4 10 0 1 0 0 is_stmt
-# CHECK: 0x{{0+}}5 10 0 1 0 0 is_stmt end_sequence
+# CHECK: 0x{{0+}}0 2 0 1 0 0 0 is_stmt
+# CHECK: 0x{{0+}}1 4 0 1 0 0 0 {{$}}
+# CHECK: 0x{{0+}}2 6 0 1 0 0 0 {{$}}
+# CHECK: 0x{{0+}}3 8 0 1 0 0 0 is_stmt
+# CHECK: 0x{{0+}}4 10 0 1 0 0 0 is_stmt
+# CHECK: 0x{{0+}}5 10 0 1 0 0 0 is_stmt end_sequence

llvm/test/MC/AsmParser/line-marker-inside-macro.s

 // RUN: llvm-mc -triple i386-unknown-unknown --filetype=obj -g %s -o %t
 // RUN: llvm-dwarfdump -a %t | FileCheck %s
 
 .macro FOO
 # 100 "./line-marker-inside-macro.s"
 .endm
 
 
 
 FOO
   mov %eax, 0
 
-// CHECK:      0x0000000000000000 105 0 1 0 0 is_stmt
-// CHECK-NEXT: 0x0000000000000005 105 0 1 0 0 is_stmt end_sequence
+// CHECK:      0x0000000000000000 105 0 1 0 0 0 is_stmt
+// CHECK-NEXT: 0x0000000000000005 105 0 1 0 0 0 is_stmt end_sequence

llvm/test/MC/ELF/discriminator.s

 .L.debug_abbrev_end:
 
 
 # CHECK:      Relocations [
 # CHECK:        Section ({{[^ ]+}}) .rel.debug_line {
 # CHECK-NEXT:     0x2E R_386_32 .text
 # CHECK-NEXT:   }
 
-# DWARF-DUMP: Address            Line   Column File   ISA Discriminator Flags
-# DWARF-DUMP: ------------------ ------ ------ ------ --- ------------- -------------
-# DWARF-DUMP: 0x0000000000000000     2      0      1   0             1  is_stmt
+# DWARF-DUMP: Address            Line   Column File   ISA Discriminator OpIndex Flags
+# DWARF-DUMP: ------------------ ------ ------ ------ --- ------------- ------- -------------
+# DWARF-DUMP: 0x0000000000000000     2      0      1   0             1        0  is_stmt

llvm/test/MC/MachO/gen-dwarf-cpp.s

 // CHECK-NEXT: name: "t.s"
 // CHECK-NEXT: dir_index: 0
 // CHECK: file_names[  2]:
 // CHECK-NEXT: name: "g.s"
 // CHECK-NEXT: dir_index: 1
 // CHECK-NOT: file_names
 
 // We check that the source line number 100 is picked up before the "movl"
-// CHECK: Address            Line   Column File   ISA Discriminator Flags
-// CHECK: ------------------ ------ ------ ------ --- ------------- -------------
-// CHECK: 0x0000000000000000    102      0      1   0             0  is_stmt
+// CHECK: Address            Line   Column File   ISA Discriminator OpIndex Flags
+// CHECK: ------------------ ------ ------ ------ --- ------------- ------- -------------
+// CHECK: 0x0000000000000000    102      0      1   0             0       0  is_stmt

llvm/test/MC/MachO/gen-dwarf.s

 // CHECK: standard_opcode_lengths[DW_LNS_set_prologue_end] = 0
 // CHECK: standard_opcode_lengths[DW_LNS_set_epilogue_begin] = 0
 // CHECK: standard_opcode_lengths[DW_LNS_set_isa] = 1
 // We don't check include_directories as it has a temp path
 // CHECK: file_names[  1]:
 // CHECK-NEXT: name: "gen-dwarf.s"
 // CHECK-NEXT: dir_index: 1
 
-// CHECK: Address            Line   Column File   ISA Discriminator Flags
-// CHECK: ------------------ ------ ------ ------ --- ------------- -------------
-// CHECK: 0x0000000000000000      6      0      1   0             0  is_stmt
-// CHECK: 0x0000000000000005      7      0      1   0             0  is_stmt
-// CHECK: 0x0000000000000006      8      0      1   0             0  is_stmt
-// CHECK: 0x0000000000000007     11      0      1   0             0  is_stmt
-// CHECK: 0x0000000000000008     11      0      1   0             0  is_stmt end_sequence
+// CHECK: Address            Line   Column File   ISA Discriminator OpIndex Flags
+// CHECK: ------------------ ------ ------ ------ --- ------------- ------- -------------
+// CHECK: 0x0000000000000000      6      0      1   0             0       0  is_stmt
+// CHECK: 0x0000000000000005      7      0      1   0             0       0  is_stmt
+// CHECK: 0x0000000000000006      8      0      1   0             0       0  is_stmt
+// CHECK: 0x0000000000000007     11      0      1   0             0       0  is_stmt
+// CHECK: 0x0000000000000008     11      0      1   0             0       0  is_stmt end_sequence

llvm/test/tools/dsymutil/X86/basic-linking-x86.test

 CHECK-NEXT:Address Range Header: length = 0x0000003c, format = DWARF32, version = 0x0002, cu_offset = 0x00000126, addr_size = 0x08, seg_size = 0x00
 CHECK-NEXT:[0x0000000100000f40, 0x0000000100000f84)
 CHECK-NEXT:[0x0000000100000f90, 0x0000000100000fa9)
 
 CHECK: .debug_line contents:
 CHECK: file_names[  1]:
 CHECK-NEXT: name: "basic1.c"
 CHECK-NEXT: dir_index: 0
-CHECK: Address            Line   Column File   ISA Discriminator Flags
-CHECK-NEXT: ------------------ ------ ------ ------ --- ------------- -------------
-CHECK-NEXT: 0x0000000100000ea0     23      0      1   0             0  is_stmt
-CHECK-NEXT: 0x0000000100000eb6     24      0      1   0             0  is_stmt prologue_end
-CHECK-NEXT: 0x0000000100000ec4     24      0      1   0             0  is_stmt end_sequence
+CHECK: Address            Line   Column File   ISA Discriminator OpIndex Flags
+CHECK-NEXT: ------------------ ------ ------ ------ --- ------------- ------- -------------
+CHECK-NEXT: 0x0000000100000ea0     23      0      1   0             0       0  is_stmt
+CHECK-NEXT: 0x0000000100000eb6     24      0      1   0             0       0  is_stmt prologue_end
+CHECK-NEXT: 0x0000000100000ec4     24      0      1   0             0       0  is_stmt end_sequence
 
 CHECK: file_names[  1]:
 CHECK-NEXT: name: "basic2.c"
 CHECK-NEXT: dir_index: 0
-CHECK: Address            Line   Column File   ISA Discriminator Flags
-CHECK-NEXT: ------------------ ------ ------ ------ --- ------------- -------------
-CHECK-NEXT: 0x0000000100000ed0     19      0      1   0             0  is_stmt
-CHECK-NEXT: 0x0000000100000ee2     20      0      1   0             0  is_stmt prologue_end
-CHECK-NEXT: 0x0000000100000f19     20      0      1   0             0  is_stmt end_sequence
-CHECK-NEXT: 0x0000000100000f20     14      0      1   0             0  is_stmt
-CHECK-NEXT: 0x0000000100000f24     15      0      1   0             0  is_stmt prologue_end
-CHECK-NEXT: 0x0000000100000f37     15      0      1   0             0  is_stmt end_sequence
+CHECK: Address            Line   Column File   ISA Discriminator OpIndex Flags
+CHECK-NEXT: ------------------ ------ ------ ------ --- ------------- ------- -------------
+CHECK-NEXT: 0x0000000100000ed0     19      0      1   0             0       0  is_stmt
+CHECK-NEXT: 0x0000000100000ee2     20      0      1   0             0       0  is_stmt prologue_end
+CHECK-NEXT: 0x0000000100000f19     20      0      1   0             0       0  is_stmt end_sequence
+CHECK-NEXT: 0x0000000100000f20     14      0      1   0             0       0  is_stmt
+CHECK-NEXT: 0x0000000100000f24     15      0      1   0             0       0  is_stmt prologue_end
+CHECK-NEXT: 0x0000000100000f37     15      0      1   0             0       0  is_stmt end_sequence
 
 CHECK: file_names[  1]:
 CHECK-NEXT: name: "basic3.c"
 CHECK-NEXT: dir_index: 0
-CHECK: Address            Line   Column File   ISA Discriminator Flags
-CHECK-NEXT: ------------------ ------ ------ ------ --- ------------- -------------
-CHECK-NEXT: 0x0000000100000f40     16      0      1   0             0  is_stmt
-CHECK-NEXT: 0x0000000100000f4b     17      0      1   0             0  is_stmt prologue_end
-CHECK-NEXT: 0x0000000100000f58     18      0      1   0             0  is_stmt
-CHECK-NEXT: 0x0000000100000f6c     19      0      1   0             0  is_stmt
-CHECK-NEXT: 0x0000000100000f7b     20      0      1   0             0  is_stmt
-CHECK-NEXT: 0x0000000100000f84     20      0      1   0             0  is_stmt end_sequence
-CHECK-NEXT: 0x0000000100000f90     11      0      1   0             0  is_stmt
-CHECK-NEXT: 0x0000000100000f9b     12      0      1   0             0  is_stmt prologue_end
-CHECK-NEXT: 0x0000000100000fa9     12      0      1   0             0  is_stmt end_sequence
+CHECK: Address            Line   Column File   ISA Discriminator OpIndex Flags
+CHECK-NEXT: ------------------ ------ ------ ------ --- ------------- ------- -------------
+CHECK-NEXT: 0x0000000100000f40     16      0      1   0             0       0  is_stmt
+CHECK-NEXT: 0x0000000100000f4b     17      0      1   0             0       0  is_stmt prologue_end
+CHECK-NEXT: 0x0000000100000f58     18      0      1   0             0       0  is_stmt
+CHECK-NEXT: 0x0000000100000f6c     19      0      1   0             0       0  is_stmt
+CHECK-NEXT: 0x0000000100000f7b     20      0      1   0             0       0  is_stmt
+CHECK-NEXT: 0x0000000100000f84     20      0      1   0             0       0  is_stmt end_sequence
+CHECK-NEXT: 0x0000000100000f90     11      0      1   0             0       0  is_stmt
+CHECK-NEXT: 0x0000000100000f9b     12      0      1   0             0       0  is_stmt prologue_end
+CHECK-NEXT: 0x0000000100000fa9     12      0      1   0             0       0  is_stmt end_sequence
 
 PUB: .debug_pubnames contents:
 PUB-NEXT: length = 0x00000017, format = DWARF32, version = 0x0002, unit_offset = 0x00000000, unit_size = 0x00000081
 PUB-NEXT: Offset     Name
 PUB-NEXT: 0x00000026 "main"
 PUB-NEXT: length = 0x00000036, format = DWARF32, version = 0x0002, unit_offset = 0x00000081, unit_size = 0x000000a5
 PUB-NEXT: Offset     Name
 PUB-NEXT: 0x0000002d "private_int"

llvm/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test

 CHECK-NEXT: [0x0000000100000f50, 0x0000000100000f87)
 CHECK-NEXT: Address Range Header: length = 0x0000002c, format = DWARF32, version = 0x0002, cu_offset = 0x0000011b, addr_size = 0x08, seg_size = 0x00
 CHECK-NEXT: [0x0000000100000f90, 0x0000000100000fb4)
 
 CHECK: .debug_line contents:
 CHECK: file_names[  1]:
 CHECK-NEXT: name: "basic1.c"
 CHECK-NEXT: dir_index: 0
-CHECK: Address            Line   Column File   ISA Discriminator Flags
-CHECK-NEXT: ------------------ ------ ------ ------ --- ------------- -------------
-CHECK-NEXT: 0x0000000100000f40     26      0      1   0             0  is_stmt
-CHECK-NEXT: 0x0000000100000f44     27     10      1   0             0  is_stmt prologue_end
-CHECK-NEXT: 0x0000000100000f49     27      3      1   0             0
-CHECK-NEXT: 0x0000000100000f4b     27      3      1   0             0  end_sequence
+CHECK: Address            Line   Column File   ISA Discriminator OpIndex Flags
+CHECK-NEXT: ------------------ ------ ------ ------ --- ------------- ------- -------------
+CHECK-NEXT: 0x0000000100000f40     26      0      1   0             0       0  is_stmt
+CHECK-NEXT: 0x0000000100000f44     27     10      1   0             0       0  is_stmt prologue_end
+CHECK-NEXT: 0x0000000100000f49     27      3      1   0             0       0
+CHECK-NEXT: 0x0000000100000f4b     27      3      1   0             0       0  end_sequence
 
 CHECK: file_names[  1]:
 CHECK-NEXT: name: "basic2.c"
 CHECK-NEXT: dir_index: 0
-CHECK: Address            Line   Column File   ISA Discriminator Flags
-CHECK-NEXT: ------------------ ------ ------ ------ --- ------------- -------------
-CHECK-NEXT: 0x0000000100000f50     19      0      1   0             0  is_stmt
-CHECK-NEXT: 0x0000000100000f54     20     18      1   0             0  is_stmt prologue_end
-CHECK-NEXT: 0x0000000100000f5a     20     17      1   0             0
-CHECK-NEXT: 0x0000000100000f5c     20     10      1   0             0
-CHECK-NEXT: 0x0000000100000f61     15     10      1   0             0  is_stmt
-CHECK-NEXT: 0x0000000100000f70     20     23      1   0             0  is_stmt
-CHECK-NEXT: 0x0000000100000f74     20     36      1   0             0
-CHECK-NEXT: 0x0000000100000f83     20     31      1   0             0
-CHECK-NEXT: 0x0000000100000f85     20      3      1   0             0
-CHECK-NEXT: 0x0000000100000f87     20      3      1   0             0  end_sequence
+CHECK: Address            Line   Column File   ISA Discriminator OpIndex Flags
+CHECK-NEXT: ------------------ ------ ------ ------ --- ------------- ------- -------------
+CHECK-NEXT: 0x0000000100000f50     19      0      1   0             0       0  is_stmt
+CHECK-NEXT: 0x0000000100000f54     20     18      1   0             0       0  is_stmt prologue_end
+CHECK-NEXT: 0x0000000100000f5a     20     17      1   0             0       0
+CHECK-NEXT: 0x0000000100000f5c     20     10      1   0             0       0
+CHECK-NEXT: 0x0000000100000f61     15     10      1   0             0       0  is_stmt
+CHECK-NEXT: 0x0000000100000f70     20     23      1   0             0       0  is_stmt
+CHECK-NEXT: 0x0000000100000f74     20     36      1   0             0       0
+CHECK-NEXT: 0x0000000100000f83     20     31      1   0             0       0
+CHECK-NEXT: 0x0000000100000f85     20      3      1   0             0       0
+CHECK-NEXT: 0x0000000100000f87     20      3      1   0             0       0  end_sequence
 
 CHECK: file_names[  1]:
 CHECK-NEXT: name: "basic3.c"
 CHECK-NEXT: dir_index: 0
-CHECK: Address            Line   Column File   ISA Discriminator Flags
-CHECK-NEXT: ------------------ ------ ------ ------ --- ------------- -------------
-CHECK-NEXT: 0x0000000100000f90     16      0      1   0             0  is_stmt
-CHECK-NEXT: 0x0000000100000f94     12     10      1   0             0  is_stmt prologue_end
-CHECK-NEXT: 0x0000000100000f9a     17      7      1   0             0  is_stmt
-CHECK-NEXT: 0x0000000100000f9f     12     10      1   0             0  is_stmt
-CHECK-NEXT: 0x0000000100000fa7     20      1      1   0             0  is_stmt
-CHECK-NEXT: 0x0000000100000fa9     19     18      1   0             0  is_stmt
-CHECK-NEXT: 0x0000000100000fab     19     10      1   0             0
-CHECK-NEXT: 0x0000000100000fb2     20      1      1   0             0  is_stmt
-CHECK-NEXT: 0x0000000100000fb4     20      1      1   0             0  is_stmt end_sequence
+CHECK: Address            Line   Column File   ISA Discriminator OpIndex Flags
+CHECK-NEXT: ------------------ ------ ------ ------ --- ------------- ------- -------------
+CHECK-NEXT: 0x0000000100000f90     16      0      1   0             0       0  is_stmt
+CHECK-NEXT: 0x0000000100000f94     12     10      1   0             0       0  is_stmt prologue_end
+CHECK-NEXT: 0x0000000100000f9a     17      7      1   0             0       0  is_stmt
+CHECK-NEXT: 0x0000000100000f9f     12     10      1   0             0       0  is_stmt
+CHECK-NEXT: 0x0000000100000fa7     20      1      1   0             0       0  is_stmt
+CHECK-NEXT: 0x0000000100000fa9     19     18      1   0             0       0  is_stmt
+CHECK-NEXT: 0x0000000100000fab     19     10      1   0             0       0
+CHECK-NEXT: 0x0000000100000fb2     20      1      1   0             0       0  is_stmt
+CHECK-NEXT: 0x0000000100000fb4     20      1      1   0             0       0  is_stmt end_sequence
 
 CHECK-NOT: .debug_pubnames contents:
 CHECK-NOT: .debug_pubtypes contents:
 
 CHECK: .apple_names contents:
 CHECK-NEXT: Header {
 CHECK-NEXT:   Magic: 0x48415348
 CHECK-NEXT:   Version: 0x1

llvm/test/tools/dsymutil/X86/basic-lto-linking-x86.test

 CHECK-NEXT: Address Range Header: length = 0x0000002c, format = DWARF32, version = 0x0002, cu_offset = 0x0000013a, addr_size = 0x08, seg_size = 0x00
 CHECK-NEXT: [0x0000000100000f90, 0x0000000100000fb4)
 
 
 CHECK: .debug_line contents
 CHECK: file_names[  1]:
 CHECK-NEXT: name: "basic1.c"
 CHECK-NEXT: dir_index: 0
-CHECK: 0x0000000100000f40     23      0      1   0             0  is_stmt
-CHECK: 0x0000000100000f44     24      0      1   0             0  is_stmt prologue_end
-CHECK: 0x0000000100000f4b     24      0      1   0             0  is_stmt end_sequence
+CHECK: 0x0000000100000f40     23      0      1   0             0       0  is_stmt
+CHECK: 0x0000000100000f44     24      0      1   0             0       0  is_stmt prologue_end
+CHECK: 0x0000000100000f4b     24      0      1   0             0       0  is_stmt end_sequence
 
 CHECK: file_names[  1]:
 CHECK-NEXT: name: "basic2.c"
 CHECK-NEXT: dir_index: 0
-CHECK: 0x0000000100000f50     19      0      1   0             0  is_stmt
-CHECK: 0x0000000100000f54     20      0      1   0             0  is_stmt prologue_end
-CHECK: 0x0000000100000f63     15      0      1   0             0  is_stmt
-CHECK: 0x0000000100000f72     20      0      1   0             0  is_stmt
-CHECK: 0x0000000100000f89     20      0      1   0             0  is_stmt end_sequence
+CHECK: 0x0000000100000f50     19      0      1   0             0       0  is_stmt
+CHECK: 0x0000000100000f54     20      0      1   0             0       0  is_stmt prologue_end
+CHECK: 0x0000000100000f63     15      0      1   0             0       0  is_stmt
+CHECK: 0x0000000100000f72     20      0      1   0             0       0  is_stmt
+CHECK: 0x0000000100000f89     20      0      1   0             0       0  is_stmt end_sequence
 
 CHECK: file_names[  1]:
 CHECK-NEXT: name: "basic3.c"
 CHECK-NEXT: dir_index: 0
-CHECK: 0x0000000100000f90     16      0      1   0             0  is_stmt
-CHECK: 0x0000000100000f94     12      0      1   0             0  is_stmt prologue_end
-CHECK: 0x0000000100000f9a     17      0      1   0             0  is_stmt
-CHECK: 0x0000000100000f9f     12      0      1   0             0  is_stmt
-CHECK: 0x0000000100000fa7     20      0      1   0             0  is_stmt
-CHECK: 0x0000000100000fa9     19      0      1   0             0  is_stmt
-CHECK: 0x0000000100000fb2     20      0      1   0             0  is_stmt
-CHECK: 0x0000000100000fb4     20      0      1   0             0  is_stmt end_sequence
+CHECK: 0x0000000100000f90     16      0      1   0             0       0  is_stmt
+CHECK: 0x0000000100000f94     12      0      1   0             0       0  is_stmt prologue_end
+CHECK: 0x0000000100000f9a     17      0      1   0             0       0  is_stmt
+CHECK: 0x0000000100000f9f     12      0      1   0             0       0  is_stmt
+CHECK: 0x0000000100000fa7     20      0      1   0             0       0  is_stmt
+CHECK: 0x0000000100000fa9     19      0      1   0             0       0  is_stmt
+CHECK: 0x0000000100000fb2     20      0      1   0             0       0  is_stmt
+CHECK: 0x0000000100000fb4     20      0      1   0             0       0  is_stmt end_sequence
 
 CHECK-NOT: .debug_pubnames contents:
 CHECK-NOT: .debug_pubtypes contents:
 
 CHECK: .apple_names contents:
 CHECK-NEXT: Header {
 CHECK-NEXT:   Magic: 0x48415348
 CHECK-NEXT:   Version: 0x1

llvm/test/tools/llvm-dwarfdump/ARM/aligned_line_tables.s

 // RUN: llvm-nm %t.o | FileCheck %s --check-prefix=LUNALIGN
 // RUN: llvm-dwarfdump -debug-line %t.o 2>&1 | FileCheck %s --check-prefix=UNALIGN
 
 /// This test is based on a real example from ARM C/C++ Compiler.
 /// It verifies llvm-dwarfdump is able to dump line tables even if they've been
 /// placed at aligned offsets.
 
 // L4: 0000002b N .Ltable0_end
-// MULT4:      Address            Line   Column File   ISA Discriminator Flags
-// MULT4-NEXT: ------------------ ------ ------ ------ --- ------------- -------------
-// MULT4-NEXT: 0x0000000000000000      1      0      1   0             0  is_stmt end_sequence
+// MULT4:      Address            Line   Column File   ISA Discriminator OpIndex Flags
+// MULT4-NEXT: ------------------ ------ ------ ------ --- ------------- ------- -------------
+// MULT4-NEXT: 0x0000000000000000      1      0      1   0             0       0  is_stmt end_sequence
 // MULT4-EMPTY:
 // MULT4-NEXT: debug_line[0x0000002c]
 // MULT4-NEXT: Line table prologue:
 // MULT4-NEXT:    total_length: 0x0000003a{{$}}
 // MULT4-NEXT:          format: DWARF32
 // MULT4-NEXT:         version: 2{{$}}
 // MULT4-NEXT: prologue_length: 0x0000001a
 // MULT4-NEXT: min_inst_length: 2
 // MULT4-NEXT: default_is_stmt: 1
 
 // L8: 00000027 N .Ltable0_end
-// MULT8:      Address            Line   Column File   ISA Discriminator Flags
-// MULT8-NEXT: ------------------ ------ ------ ------ --- ------------- -------------
-// MULT8-NEXT: 0x0000000000000000      1      0      1   0             0  is_stmt end_sequence
+// MULT8:      Address            Line   Column File   ISA Discriminator OpIndex Flags
+// MULT8-NEXT: ------------------ ------ ------ ------ --- ------------- ------- -------------
+// MULT8-NEXT: 0x0000000000000000      1      0      1   0             0       0  is_stmt end_sequence
 // MULT8-EMPTY:
 // MULT8-NEXT: debug_line[0x00000028]
 // MULT8-NEXT: Line table prologue:
 // MULT8-NEXT:    total_length: 0x0000003a{{$}}
 // MULT8-NEXT:          format: DWARF32
 // MULT8-NEXT:         version: 2{{$}}
 // MULT8-NEXT: prologue_length: 0x0000001a
 // MULT8-NEXT: min_inst_length: 2

llvm/test/tools/llvm-dwarfdump/X86/brief.s

 # CHECK: DW_TAG_compile_unit
 # CHECK-NOT: DW_FORM
 # CHECK: DW_AT_name        ("brief.c")
 # CHECK: DW_AT_name      ("main")
 # CHECK: DW_AT_name      ("int")
 # CHECK-NOT: debug_str
 # CHECK-NOT: DW_AT_type {{.*}} =>
 
-# CHECK: Address            Line   Column File   ISA Discriminator Flags
-# CHECK-NEXT:------------------ ------ ------ ------ --- ------------- -------------
-# CHECK-NEXT:0x0000000000000000      1      0      1   0             0  is_stmt
-# CHECK-NEXT:0x0000000000000006      1     12      1   0             0  is_stmt prologue_end
-# CHECK-NEXT:0x0000000000000008      1     12      1   0             0  is_stmt end_sequence
+# CHECK: Address            Line   Column File   ISA Discriminator OpIndex Flags
+# CHECK-NEXT:------------------ ------ ------ ------ --- ------------- ------- -------------
+# CHECK-NEXT:0x0000000000000000      1      0      1   0             0       0  is_stmt
+# CHECK-NEXT:0x0000000000000006      1     12      1   0             0       0  is_stmt prologue_end
+# CHECK-NEXT:0x0000000000000008      1     12      1   0             0       0  is_stmt end_sequence
 
 # CHECK-NOT: {{.*}} contents:
 
 # This test is meant to verify that without specifying -verbose DW_FORMs and
 # abbreviation codes are hidden from .debug_info section. Furthermore it
 # verifies that it also hides .debug_str and die reference offsets into the CU
 # and that the .debug_line table is printed rather than the opcodes.
 

llvm/test/tools/llvm-dwarfdump/X86/debug-line-dw-lne-end-sequence.s

 ## Show that the DW_LNE_end_sequence opcode resets the line state
 ## properly and the rows are printed correctly.
 
 # RUN: llvm-mc -filetype obj -triple x86_64 %s -o %t.o
 # RUN: llvm-dwarfdump --debug-line %t.o | FileCheck %s --check-prefixes=HEADER,ROWS
 # RUN: llvm-dwarfdump --debug-line %t.o --verbose | FileCheck %s --check-prefix=ROWS
 
-# HEADER:      Address            Line   Column File   ISA Discriminator Flags
-# HEADER-NEXT: ------------------ ------ ------ ------ --- ------------- -------------
-# ROWS:        0x0000000012345678      1      0      1   0             1  is_stmt basic_block prologue_end epilogue_begin end_sequence
-# ROWS:        0x0000000000000001      2      0      1   0             0  is_stmt
-# ROWS:        0x0000000000000001      2      0      1   0             0  is_stmt end_sequence
+# HEADER:      Address            Line   Column File   ISA Discriminator OpIndex Flags
+# HEADER-NEXT: ------------------ ------ ------ ------ --- ------------- ------- -------------
+# ROWS:        0x0000000012345678      1      0      1   0             1       0  is_stmt basic_block prologue_end epilogue_begin end_sequence
+# ROWS:        0x0000000000000001      2      0      1   0             0       0  is_stmt
+# ROWS:        0x0000000000000001      2      0      1   0             0       0  is_stmt end_sequence
 
 .section .debug_line,"",@progbits
 .Line_table_start0:
   .long   .Line_table_end0-.Line_table_start0-4   # Length of Unit
   .short  5               # DWARF version number
   .byte   8               # Address Size
   .byte   0               # Segment Selector Size
   .long   .Line_table_header_end0-.Line_table_params0     # Length of Prologue

llvm/test/tools/llvm-dwarfdump/X86/debug-line-dw-lns-copy.s

 # RUN: llvm-mc -filetype obj -triple x86_64-pc-linux %s -o %t.o
 # RUN: llvm-dwarfdump -debug-line %t.o | FileCheck %s
 
-# CHECK:      Address            Line   Column File   ISA Discriminator Flags
-# CHECK-NEXT: ------------------ ------ ------ ------ --- ------------- -------------
-# CHECK-NEXT: 0x0000000000000000      1      0      1   0             1  is_stmt
-# CHECK-NEXT: 0x0000000000000001      2      0      1   0             0  is_stmt
-# CHECK-NEXT: 0x0000000000000001      2      0      1   0             0  is_stmt end_sequence
+# CHECK:      Address            Line   Column File   ISA Discriminator OpIndex Flags
+# CHECK-NEXT: ------------------ ------ ------ ------ --- ------------- ------- -------------
+# CHECK-NEXT: 0x0000000000000000      1      0      1   0             1       0  is_stmt
+# CHECK-NEXT: 0x0000000000000001      2      0      1   0             0       0  is_stmt
+# CHECK-NEXT: 0x0000000000000001      2      0      1   0             0       0  is_stmt end_sequence
 
 .section .debug_line,"",@progbits
 .Line_table_start0:
   .long   .Line_table_end0-.Line_table_start0-4   # Length of Unit
   .short  5               # DWARF version number
   .byte   8               # Address Size
   .byte   0               # Segment Selector Size
   .long   .Line_table_header_end0-.Line_table_params0     # Length of Prologue

llvm/test/tools/llvm-dwarfdump/X86/debug-line.s

 # CHECK-NEXT: standard_opcode_lengths[DW_LNS_unknown_d] = 0
 # CHECK-NEXT: include_directories[  0] = "dir1/dir2"
 # CHECK-NEXT: file_names[  0]:
 # CHECK-NEXT:            name: "file1.c"
 # CHECK-NEXT:       dir_index: 2
 # CHECK-NEXT:        mod_time: 0x12345678
 # CHECK-NEXT:          length: 0x00000010
 # CHECK-EMPTY:
-# CHECK-NEXT: Address            Line   Column File   ISA Discriminator Flags
-# CHECK-NEXT: ------------------ ------ ------ ------ --- ------------- -------------
-# CHECK-NEXT: 0x0000000000000002      1      0      1   0             0  is_stmt
-# CHECK-NEXT: 0x0000000000000002      1      4      3   0             0  is_stmt
-# CHECK-NEXT: 0x0000000000000024      1      4      3   5             6  basic_block prologue_end epilogue_begin end_sequence
+# CHECK-NEXT: Address            Line   Column File   ISA Discriminator OpIndex Flags
+# CHECK-NEXT: ------------------ ------ ------ ------ --- ------------- ------- -------------
+# CHECK-NEXT: 0x0000000000000002      1      0      1   0             0       0  is_stmt
+# CHECK-NEXT: 0x0000000000000002      1      4      3   0             0       0  is_stmt
+# CHECK-NEXT: 0x0000000000000024      1      4      3   5             6       0  basic_block prologue_end epilogue_begin end_sequence
 # CHECK-EMPTY:
 # CHECK-NEXT: debug_line[0x0000006d]
 # CHECK-NEXT: Line table prologue:
 # CHECK-NEXT:     total_length: 0x0000001b
 # CHECK-NEXT:           format: DWARF32
 # CHECK-NEXT:          version: 4
 # CHECK-NEXT:  prologue_length: 0x00000015
 # CHECK-NEXT:  min_inst_length: 2

llvm/test/tools/llvm-dwarfdump/X86/debug_line_dwarf64_large_table.s

 # CHECK-NEXT:  prologue_length: 0x0000000000000016
 # CHECK:        file_names[ 1]:
 # CHECK-NEXT:             name: "file1"
 # CHECK-NEXT:        dir_index: 0
 # CHECK-NEXT:         mod_time: 0x00000000
 # CHECK-NEXT:           length: 0x00000000
 # CHECK-NEXT: warning: line table program with offset 0x00000000 has length 0xfffffffc but only 0x0000003a bytes are available
 
-# CHECK:      0x000000000badbeef      1      0      1   0             0  is_stmt end_sequence
+# CHECK:      0x000000000badbeef      1      0      1   0             0       0  is_stmt end_sequence
 
 .section .debug_line,"",@progbits
 .long   0xffffffff      # Length of Unit (DWARF-64 format)
 .quad   0xfffffff0
 .short  4               # DWARF version number
 .quad   .Lprologue1_end-.Lprologue1_start # Length of Prologue
 .Lprologue1_start:
 .byte   1               # Minimum Instruction Length

llvm/test/tools/llvm-dwarfdump/X86/debug_line_invalid.test

 ## Don't stop looking for the later unit if non-fatal issues are found.
 # RUN: llvm-dwarfdump -debug-line=0x3ed %t-malformed.o 2>&1 \
 # RUN:   | FileCheck %s --check-prefixes=HEADER,LAST,SOME-ERR --implicit-check-not='debug_line[{{.*}}]' \
 # RUN:       --implicit-check-not='warning:'
 
 # HEADER:       .debug_line contents:
 
 # FIRST:        debug_line[0x00000000]
-# VERBOSE:        Address            Line   Column File   ISA Discriminator Flags
-# VERBOSE-NEXT:   ------------------ ------ ------ ------ --- ------------- -------------
+# VERBOSE:        Address            Line   Column File   ISA Discriminator OpIndex Flags
+# VERBOSE-NEXT:   ------------------ ------ ------ ------ --- ------------- ------- -------------
 # VERBOSE-NEXT: DW_LNE_set_address (0x000000000badbeef)
 # VERBOSE-NEXT: DW_LNE_end_sequence
 # FIRST:        0x000000000badbeef {{.*}} end_sequence
 # FIRST-EMPTY:
 # NOFIRST-NOT:  debug_line[0x00000000]
 # NOFIRST-NOT:  0x000000000badbeef {{.*}} end_sequence
 # NOLATER-NOT:  debug_line[{{.*}}]
 # NOLATER-NOT:  end_sequence

llvm/test/tools/llvm-dwarfdump/X86/debug_line_offset.test

 RUN: llvm-dwarfdump %S/../../dsymutil/Inputs/basic-lto-dw4.macho.x86_64.o \
 RUN:  -debug-line=0x0 | FileCheck %s --check-prefix=CHECK-A
 
 CHECK-A: debug_line[0x00000000]
-CHECK-A: Address            Line   Column File   ISA Discriminator Flags
-CHECK-A-NEXT: ------------------ ------ ------ ------ --- ------------- -------------
-CHECK-A-NEXT: 0x0000000000000000     26      0      1   0             0  is_stmt
-CHECK-A-NEXT: 0x0000000000000004     27     10      1   0             0  is_stmt prologue_end
-CHECK-A-NEXT: 0x0000000000000009     27      3      1   0             0
-CHECK-A-NEXT: 0x0000000000000074     27      3      1   0             0  end_sequence
+CHECK-A: Address            Line   Column File   ISA Discriminator OpIndex Flags
+CHECK-A-NEXT: ------------------ ------ ------ ------ --- ------------- ------- -------------
+CHECK-A-NEXT: 0x0000000000000000     26      0      1   0             0       0  is_stmt
+CHECK-A-NEXT: 0x0000000000000004     27     10      1   0             0       0  is_stmt prologue_end
+CHECK-A-NEXT: 0x0000000000000009     27      3      1   0             0       0
+CHECK-A-NEXT: 0x0000000000000074     27      3      1   0             0       0  end_sequence
 CHECK-A-NOT: debug_line[0x0000009a]
 
 RUN: llvm-dwarfdump %S/../../dsymutil/Inputs/basic-lto-dw4.macho.x86_64.o \
 RUN:  -debug-line=0x9a | FileCheck %s --check-prefix=CHECK-B
 
 CHECK-B-NOT: debug_line[0x00000000]
 CHECK-B: debug_line[0x0000009a]
-CHECK-B: Address            Line   Column File   ISA Discriminator Flags
-CHECK-B-NEXT: ------------------ ------ ------ ------ --- ------------- -------------
-CHECK-B-NEXT: 0x0000000000000050     16      0      1   0             0  is_stmt
-CHECK-B-NEXT: 0x0000000000000054     12     10      1   0             0  is_stmt prologue_end
-CHECK-B-NEXT: 0x000000000000005a     17      7      1   0             0  is_stmt
-CHECK-B-NEXT: 0x000000000000005f     12     10      1   0             0  is_stmt
-CHECK-B-NEXT: 0x0000000000000067     20      1      1   0             0  is_stmt
-CHECK-B-NEXT: 0x0000000000000069     19     18      1   0             0  is_stmt
-CHECK-B-NEXT: 0x000000000000006b     19     10      1   0             0
-CHECK-B-NEXT: 0x0000000000000072     20      1      1   0             0  is_stmt
-CHECK-B-NEXT: 0x0000000000000074     20      1      1   0             0  is_stmt end_sequence
+CHECK-B: Address            Line   Column File   ISA Discriminator OpIndex Flags
+CHECK-B-NEXT: ------------------ ------ ------ ------ --- ------------- ------- -------------
+CHECK-B-NEXT: 0x0000000000000050     16      0      1   0             0       0  is_stmt
+CHECK-B-NEXT: 0x0000000000000054     12     10      1   0             0       0  is_stmt prologue_end
+CHECK-B-NEXT: 0x000000000000005a     17      7      1   0             0       0  is_stmt
+CHECK-B-NEXT: 0x000000000000005f     12     10      1   0             0       0  is_stmt
+CHECK-B-NEXT: 0x0000000000000067     20      1      1   0             0       0  is_stmt
+CHECK-B-NEXT: 0x0000000000000069     19     18      1   0             0       0  is_stmt
+CHECK-B-NEXT: 0x000000000000006b     19     10      1   0             0       0
+CHECK-B-NEXT: 0x0000000000000072     20      1      1   0             0       0  is_stmt
+CHECK-B-NEXT: 0x0000000000000074     20      1      1   0             0       0  is_stmt end_sequence

llvm/test/tools/llvm-dwarfdump/X86/verbose.test

 #       CHECK:0x0000002a:   DW_TAG_subprogram [2]   (0x0000000b)
 #       CHECK:                DW_AT_name [DW_FORM_strp] ( .debug_str[0x{{.*}}] = "main")
 #       CHECK:0x00000043:   DW_TAG_base_type [3]   (0x0000000b)
 #  CHECK-NEXT:                DW_AT_name [DW_FORM_strp] ( .debug_str[0x{{.*}}] = "int")
 
 #       CHECK:.debug_line contents:
 #       CHECK:         length: 0x00000000
 # CHECK-EMPTY:
-#  CHECK-NEXT:            Address            Line   Column File   ISA Discriminator Flags
-#  CHECK-NEXT:            ------------------ ------ ------ ------ --- ------------- -------------
+#  CHECK-NEXT:            Address            Line   Column File   ISA Discriminator OpIndex Flags
+#  CHECK-NEXT:            ------------------ ------ ------ ------ --- ------------- ------- -------------
 #  CHECK-NEXT:0x00000029: 00 DW_LNE_set_address (0x0000000000000000)
 #  CHECK-NEXT:0x00000034: 01 DW_LNS_copy
-#  CHECK-NEXT:            0x0000000000000000      1      0      1   0             0  is_stmt
+#  CHECK-NEXT:            0x0000000000000000      1      0      1   0             0       0  is_stmt
 #  CHECK-NEXT:0x00000035: 05 DW_LNS_set_column (12)
 #  CHECK-NEXT:0x00000037: 0a DW_LNS_set_prologue_end
 #  CHECK-NEXT:0x00000038: 66 address += 6,  line += 0
-#  CHECK-NEXT:            0x0000000000000006      1     12      1   0             0  is_stmt prologue_end
+#  CHECK-NEXT:            0x0000000000000006      1     12      1   0             0       0  is_stmt prologue_end
 #  CHECK-NEXT:0x00000039: 02 DW_LNS_advance_pc (2)
 #  CHECK-NEXT:0x0000003b: 00 DW_LNE_end_sequence
-#  CHECK-NEXT:            0x0000000000000008      1     12      1   0             0  is_stmt end_sequence
+#  CHECK-NEXT:            0x0000000000000008      1     12      1   0             0       0  is_stmt end_sequence
 # CHECK-EMPTY:
 
 #   CHECK-NOT:{{.*}} contents:

llvm/test/tools/llvm-dwarfdump/XCOFF/basic.test

 # DWARF32-NEXT:  standard_opcode_lengths[DW_LNS_set_prologue_end] = 0
 # DWARF32-NEXT:  standard_opcode_lengths[DW_LNS_set_epilogue_begin] = 0
 # DWARF32-NEXT:  standard_opcode_lengths[DW_LNS_set_isa] = 1
 # DWARF32-NEXT:  file_names[  1]:
 # DWARF32-NEXT:             name: "basic.c"
 # DWARF32-NEXT:        dir_index: 0
 # DWARF32-NEXT:         mod_time: 0x00000000
 # DWARF32-NEXT:           length: 0x00000000
-# DWARF32:       Address            Line   Column File   ISA Discriminator Flags
-# DWARF32-NEXT:  ------------------ ------ ------ ------ --- ------------- -------------
-# DWARF32-NEXT:  0x0000000000000000      1      0      1   0             0  is_stmt
-# DWARF32-NEXT:  0x0000000000000004      3      0      1   0             0  is_stmt
-# DWARF32-NEXT:  0x0000000000000008      4      0      1   0             0  is_stmt
-# DWARF32-NEXT:  0x0000000000000080      4      0      1   0             0  is_stmt end_sequence
+# DWARF32:       Address            Line   Column File   ISA Discriminator OpIndex Flags
+# DWARF32-NEXT:  ------------------ ------ ------ ------ --- ------------- ------- -------------
+# DWARF32-NEXT:  0x0000000000000000      1      0      1   0             0       0  is_stmt
+# DWARF32-NEXT:  0x0000000000000004      3      0      1   0             0       0  is_stmt
+# DWARF32-NEXT:  0x0000000000000008      4      0      1   0             0       0  is_stmt
+# DWARF32-NEXT:  0x0000000000000080      4      0      1   0             0       0  is_stmt end_sequence
 # DWARF32:      .debug_pubnames contents:
 # DWARF32-NEXT:  length = 0x00000017, format = DWARF32, version = 0x0002, unit_offset = 0x00000000, unit_size = 0x00000098
 # DWARF32-NEXT:  Offset     Name
 # DWARF32-NEXT:  0x00000067 "main"
 # DWARF32:       .debug_pubtypes contents:
 # DWARF32-NEXT:  length = 0x0000001f, format = DWARF32, version = 0x0002, unit_offset = 0x00000000, unit_size = 0x00000098
 # DWARF32-NEXT:  Offset     Name
 # DWARF32-NEXT:  0x0000004e "int"

 # DWARF64-NEXT:  standard_opcode_lengths[DW_LNS_set_prologue_end] = 0
 # DWARF64-NEXT:  standard_opcode_lengths[DW_LNS_set_epilogue_begin] = 0
 # DWARF64-NEXT:  standard_opcode_lengths[DW_LNS_set_isa] = 1
 # DWARF64-NEXT:  file_names[  1]:
 # DWARF64-NEXT:             name: "basic.c"
 # DWARF64-NEXT:        dir_index: 0
 # DWARF64-NEXT:         mod_time: 0x00000000
 # DWARF64-NEXT:           length: 0x00000000
-# DWARF64:       Address            Line   Column File   ISA Discriminator Flags
-# DWARF64-NEXT:  ------------------ ------ ------ ------ --- ------------- -------------
-# DWARF64-NEXT:  0x0000000000000000      1      0      1   0             0  is_stmt
-# DWARF64-NEXT:  0x0000000000000004      3      0      1   0             0  is_stmt
-# DWARF64-NEXT:  0x0000000000000008      4      0      1   0             0  is_stmt
-# DWARF64-NEXT:  0x0000000000000080      4      0      1   0             0  is_stmt end_sequence
+# DWARF64:       Address            Line   Column File   ISA Discriminator OpIndex Flags
+# DWARF64-NEXT:  ------------------ ------ ------ ------ --- ------------- ------- -------------
+# DWARF64-NEXT:  0x0000000000000000      1      0      1   0             0       0  is_stmt
+# DWARF64-NEXT:  0x0000000000000004      3      0      1   0             0       0  is_stmt
+# DWARF64-NEXT:  0x0000000000000008      4      0      1   0             0       0  is_stmt
+# DWARF64-NEXT:  0x0000000000000080      4      0      1   0             0       0  is_stmt end_sequence
 # DWARF64:       .debug_pubnames contents:
 # DWARF64-NEXT:  length = 0x0000000000000027, format = DWARF64, version = 0x0002, unit_offset = 0x0000000000000000, unit_size = 0x00000000000000d0
 # DWARF64-NEXT:  Offset     Name
 # DWARF64-NEXT:  0x000000000000008b "main"
 # DWARF64:       .debug_pubtypes contents:
 # DWARF64-NEXT:  length = 0x0000000000000033, format = DWARF64, version = 0x0002, unit_offset = 0x0000000000000000, unit_size = 0x00000000000000d0
 # DWARF64-NEXT:  Offset     Name
 # DWARF64-NEXT:  0x0000000000000066 "int"
 # DWARF64-NEXT:  0x000000000000005e "char"

llvm/test/tools/llvm-symbolizer/only-empty-ranges.s

 # REQUIRES: x86-registered-target
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: llvm-symbolizer 0x0 0x2 0x3 0x4 --obj=%t.o | FileCheck %s
 # This test makes sure we don't attempt to access out of the line table boundaries
 # if the last range is empty.
 # Produced from the following program:
 # int func(int a) {
 #   return 1 + a;
 # }
 # compiled with clang -O3 -g -S
 # Edited by adding a redundant, empty last range.
 # The line table (llvm-dwarfdump --debug-line) looks like:
 #
-# Address            Line   Column File   ISA Discriminator Flags
-# ------------------ ------ ------ ------ --- ------------- -------------
-# 0x0000000000000000      1      0      1   0             0  is_stmt
-# 0x0000000000000000      2     12      1   0             0  is_stmt prologue_end
-# 0x0000000000000003      2      3      1   0             0
-# 0x0000000000000003      3      3      1   0             0
-# 0x0000000000000004      3      3      1   0             0  end_sequence
+# Address            Line   Column File   ISA Discriminator OpIndex Flags
+# ------------------ ------ ------ ------ --- ------------- ------- -------------
+# 0x0000000000000000      1      0      1   0             0       0  is_stmt
+# 0x0000000000000000      2     12      1   0             0       0  is_stmt prologue_end
+# 0x0000000000000003      2      3      1   0             0       0
+# 0x0000000000000003      3      3      1   0             0       0
+# 0x0000000000000004      3      3      1   0             0       0  end_sequence
 #
 # 0x0 should pick the second line in the table - line 2, col 12
 # CHECK:    func
 # CHECK:  /scratch/a.cpp:2:12
 # 0x2 does not exist in the table, so we should pick the line with a
 # lower address that describes the range - in this case, the second line.
 # CHECK:    func
 # CHECK:  /scratch/a.cpp:2:12

llvm/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp

#endif
   EXPECT_EQ(NextLine(), "standard_opcode_lengths[DW_LNS_set_isa] = 1");
   EXPECT_EQ(NextLine(), "standard_opcode_lengths[DW_LNS_unknown_d] = 2");
   EXPECT_EQ(NextLine(), "standard_opcode_lengths[DW_LNS_unknown_e] = 0");
   EXPECT_EQ(NextLine(), "include_directories[  0] = \"a dir\"");
   EXPECT_EQ(NextLine(), "file_names[  0]:");
   EXPECT_EQ(NextLine(), "           name: \"a file\"");
   EXPECT_EQ(NextLine(), "      dir_index: 0");
   EXPECT_EQ(NextLine(), "");
-  EXPECT_EQ(NextLine(), "            Address            Line   Column File   ISA Discriminator Flags");
-  EXPECT_EQ(NextLine(), "            ------------------ ------ ------ ------ --- ------------- -------------");
+  EXPECT_EQ(NextLine(), "            Address            Line   Column File   "
+                        "ISA Discriminator OpIndex Flags");
+  EXPECT_EQ(NextLine(), "            ------------------ ------ ------ ------ "
+                        "--- ------------- ------- -------------");
   EXPECT_EQ(NextLine(),
             "0x00000038: 00 Badly formed extended line op (length 0)");
   EXPECT_EQ(NextLine(),
             "0x0000003a: 00 Unrecognized extended op 0x00 length 2");
   EXPECT_EQ(NextLine(),
             "0x0000003e: 00 Unrecognized extended op 0x42 length 2");
   EXPECT_EQ(NextLine(),
             "0x00000042: 00 DW_LNE_set_address (0x0123456789abcdef)");
   EXPECT_EQ(NextLine(), "0x0000004d: 00 DW_LNE_define_file (a, dir=2, "
                         "mod_time=(0x0000000000000003), length=4)");
   EXPECT_EQ(NextLine(), "0x00000055: 00 DW_LNE_set_discriminator (127)");
   EXPECT_EQ(NextLine(), "0x00000059: 01 DW_LNS_copy");
   EXPECT_EQ(NextLine(), "            0x0123456789abcdef      1      0      1   "
-                        "0           127  is_stmt");
+                        "0           127       0  is_stmt");
   EXPECT_EQ(NextLine(), "0x0000005a: 02 DW_LNS_advance_pc (11)");
   EXPECT_EQ(NextLine(), "0x0000005c: 03 DW_LNS_advance_line (23)");
   EXPECT_EQ(NextLine(), "0x0000005e: 04 DW_LNS_set_file (33)");
   EXPECT_EQ(NextLine(), "0x00000060: 05 DW_LNS_set_column (44)");
   EXPECT_EQ(NextLine(), "0x00000062: 06 DW_LNS_negate_stmt");
   EXPECT_EQ(NextLine(), "0x00000063: 07 DW_LNS_set_basic_block");
   EXPECT_EQ(NextLine(),
             "0x00000064: 08 DW_LNS_const_add_pc (0x0000000000000011)");
   EXPECT_EQ(NextLine(), "0x00000065: 09 DW_LNS_fixed_advance_pc (0x0037)");
   EXPECT_EQ(NextLine(), "0x00000068: 0a DW_LNS_set_prologue_end");
   EXPECT_EQ(NextLine(), "0x00000069: 0b DW_LNS_set_epilogue_begin");
   EXPECT_EQ(NextLine(), "0x0000006a: 0c DW_LNS_set_isa (66)");
   EXPECT_EQ(NextLine(), "0x0000006c: 0d Unrecognized standard opcode "
                         "(operands: 0x0000000000000001, 0x0123456789abcdef)");
   EXPECT_EQ(NextLine(), "0x00000077: 0e Unrecognized standard opcode");
   EXPECT_EQ(NextLine(), "0x00000078: ff address += 17,  line += -3");
   EXPECT_EQ(NextLine(),
             "            0x0123456789abce53     20     44     33  66           "
-            "  0  basic_block prologue_end epilogue_begin");
+            "  0       0  basic_block prologue_end epilogue_begin");
   EXPECT_EQ(NextLine(), "0x00000079: 00 DW_LNE_end_sequence");
   EXPECT_EQ(NextLine(), "            0x0123456789abce53     20     44     33  "
-                        "66             0  end_sequence");
+                        "66             0       0  end_sequence");
   EXPECT_EQ(NextLine(), "");
   EXPECT_EQ(Output.size(), Pos);
 }
 
 struct TruncatedPrologueFixture
     : public TestWithParam<
           std::tuple<uint64_t, uint64_t, uint16_t, DwarfFormat, StringRef>>,
       public CommonFixture {