diff options
47 files changed, 289 insertions, 281 deletions
diff --git a/bolt/test/AArch64/asm-func-debug.test b/bolt/test/AArch64/asm-func-debug.test index 0623916..546add5 100644 --- a/bolt/test/AArch64/asm-func-debug.test +++ b/bolt/test/AArch64/asm-func-debug.test @@ -22,5 +22,5 @@ CHECK-NEXT: Address Range Header: length = 0x0000002c, format = DWARF32, versi 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 diff --git a/bolt/test/X86/asm-func-debug.test b/bolt/test/X86/asm-func-debug.test index 6f5c91a..095ae92 100644 --- a/bolt/test/X86/asm-func-debug.test +++ b/bolt/test/X86/asm-func-debug.test @@ -22,5 +22,5 @@ CHECK-NEXT: Address Range Header: length = 0x0000002c, format = DWARF32, versi 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 diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h index 5c01dad..dc32f1e 100644 --- a/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h +++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h @@ -167,6 +167,10 @@ public: /// 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, diff --git a/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp index dc46c76..818cc25 100644 --- a/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp +++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp @@ -477,6 +477,7 @@ void DWARFDebugLine::Row::reset(bool DefaultIsStmt) { Isa = 0; Discriminator = 0; IsStmt = DefaultIsStmt; + OpIndex = 0; BasicBlock = false; EndSequence = false; PrologueEnd = false; @@ -485,15 +486,16 @@ void DWARFDebugLine::Row::reset(bool DefaultIsStmt) { 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" : "") diff --git a/llvm/test/CodeGen/AMDGPU/prologue-epilogue-markers.ll b/llvm/test/CodeGen/AMDGPU/prologue-epilogue-markers.ll index e2da1a0..79bcaf8 100644 --- a/llvm/test/CodeGen/AMDGPU/prologue-epilogue-markers.ll +++ b/llvm/test/CodeGen/AMDGPU/prologue-epilogue-markers.ll @@ -22,10 +22,10 @@ define hidden void @_Z9base_casev() #0 !dbg !6 { ; 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 diff --git a/llvm/test/DebugInfo/CSKY/dwarf-csky-relocs.ll b/llvm/test/DebugInfo/CSKY/dwarf-csky-relocs.ll index e6c6946..801c0b5 100644 --- a/llvm/test/DebugInfo/CSKY/dwarf-csky-relocs.ll +++ b/llvm/test/DebugInfo/CSKY/dwarf-csky-relocs.ll @@ -71,12 +71,12 @@ ; 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" diff --git a/llvm/test/DebugInfo/Generic/multiline.ll b/llvm/test/DebugInfo/Generic/multiline.ll index a5e02bb..12476db 100644 --- a/llvm/test/DebugInfo/Generic/multiline.ll +++ b/llvm/test/DebugInfo/Generic/multiline.ll @@ -29,13 +29,13 @@ ; 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 diff --git a/llvm/test/DebugInfo/Generic/unconditional-branch.ll b/llvm/test/DebugInfo/Generic/unconditional-branch.ll index f0b44f2..9f8f975 100644 --- a/llvm/test/DebugInfo/Generic/unconditional-branch.ll +++ b/llvm/test/DebugInfo/Generic/unconditional-branch.ll @@ -3,9 +3,9 @@ ; 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){ diff --git a/llvm/test/DebugInfo/MIR/X86/empty-inline.mir b/llvm/test/DebugInfo/MIR/X86/empty-inline.mir index ff88eee..ae843ac 100644 --- a/llvm/test/DebugInfo/MIR/X86/empty-inline.mir +++ b/llvm/test/DebugInfo/MIR/X86/empty-inline.mir @@ -11,11 +11,11 @@ # 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" diff --git a/llvm/test/DebugInfo/Mips/delay-slot.ll b/llvm/test/DebugInfo/Mips/delay-slot.ll index 8637389..ed2769f 100644 --- a/llvm/test/DebugInfo/Mips/delay-slot.ll +++ b/llvm/test/DebugInfo/Mips/delay-slot.ll @@ -10,15 +10,15 @@ ; 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" diff --git a/llvm/test/DebugInfo/Mips/fn-call-line.ll b/llvm/test/DebugInfo/Mips/fn-call-line.ll index f15881e..c12a47b 100644 --- a/llvm/test/DebugInfo/Mips/fn-call-line.ll +++ b/llvm/test/DebugInfo/Mips/fn-call-line.ll @@ -46,9 +46,9 @@ ; 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 diff --git a/llvm/test/DebugInfo/RISCV/dwarf-riscv-relocs.ll b/llvm/test/DebugInfo/RISCV/dwarf-riscv-relocs.ll index b629335..07287a9 100644 --- a/llvm/test/DebugInfo/RISCV/dwarf-riscv-relocs.ll +++ b/llvm/test/DebugInfo/RISCV/dwarf-riscv-relocs.ll @@ -67,12 +67,12 @@ ; 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" diff --git a/llvm/test/DebugInfo/X86/basic-block-sections_1.ll b/llvm/test/DebugInfo/X86/basic-block-sections_1.ll index b791519..12b60c4 100644 --- a/llvm/test/DebugInfo/X86/basic-block-sections_1.ll +++ b/llvm/test/DebugInfo/X86/basic-block-sections_1.ll @@ -46,16 +46,16 @@ ; 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 { diff --git a/llvm/test/DebugInfo/X86/discriminator.ll b/llvm/test/DebugInfo/X86/discriminator.ll index e8f892a..ef89838 100644 --- a/llvm/test/DebugInfo/X86/discriminator.ll +++ b/llvm/test/DebugInfo/X86/discriminator.ll @@ -57,6 +57,6 @@ attributes #0 = { nounwind uwtable "less-precise-fpmad"="false" "frame-pointer"= !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 {{$}} diff --git a/llvm/test/DebugInfo/X86/discriminator2.ll b/llvm/test/DebugInfo/X86/discriminator2.ll index a8c7d3f..f966372 100644 --- a/llvm/test/DebugInfo/X86/discriminator2.ll +++ b/llvm/test/DebugInfo/X86/discriminator2.ll @@ -55,7 +55,7 @@ attributes #1 = { "disable-tail-calls"="false" "less-precise-fpmad"="false" "fra !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 {{.*}} diff --git a/llvm/test/DebugInfo/X86/discriminator3.ll b/llvm/test/DebugInfo/X86/discriminator3.ll index f3e8b81b..19a7764 100644 --- a/llvm/test/DebugInfo/X86/discriminator3.ll +++ b/llvm/test/DebugInfo/X86/discriminator3.ll @@ -67,8 +67,8 @@ attributes #2 = { "disable-tail-calls"="false" "less-precise-fpmad"="false" "fra !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 diff --git a/llvm/test/DebugInfo/X86/ending-run.ll b/llvm/test/DebugInfo/X86/ending-run.ll index 00db424..54e2f68 100644 --- a/llvm/test/DebugInfo/X86/ending-run.ll +++ b/llvm/test/DebugInfo/X86/ending-run.ll @@ -4,9 +4,9 @@ ; 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: diff --git a/llvm/test/DebugInfo/X86/line-info.ll b/llvm/test/DebugInfo/X86/line-info.ll index 473dcb3..5884ee1 100644 --- a/llvm/test/DebugInfo/X86/line-info.ll +++ b/llvm/test/DebugInfo/X86/line-info.ll @@ -2,7 +2,7 @@ ; 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: diff --git a/llvm/test/DebugInfo/X86/multiple-epilogue.ll b/llvm/test/DebugInfo/X86/multiple-epilogue.ll index a115d89..dceb60e 100644 --- a/llvm/test/DebugInfo/X86/multiple-epilogue.ll +++ b/llvm/test/DebugInfo/X86/multiple-epilogue.ll @@ -24,16 +24,16 @@ ; 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 diff --git a/llvm/test/DebugInfo/XCOFF/empty-prolog.ll b/llvm/test/DebugInfo/XCOFF/empty-prolog.ll index 6451a0e..78e90cc 100644 --- a/llvm/test/DebugInfo/XCOFF/empty-prolog.ll +++ b/llvm/test/DebugInfo/XCOFF/empty-prolog.ll @@ -2,10 +2,10 @@ ; 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: diff --git a/llvm/test/DebugInfo/XCOFF/empty.ll b/llvm/test/DebugInfo/XCOFF/empty.ll index 22aff20..9fcc6f9 100644 --- a/llvm/test/DebugInfo/XCOFF/empty.ll +++ b/llvm/test/DebugInfo/XCOFF/empty.ll @@ -517,8 +517,8 @@ entry: ; 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 diff --git a/llvm/test/Linker/subprogram-linkonce-weak.ll b/llvm/test/Linker/subprogram-linkonce-weak.ll index 368de59..0d4eae9 100644 --- a/llvm/test/Linker/subprogram-linkonce-weak.ll +++ b/llvm/test/Linker/subprogram-linkonce-weak.ll @@ -151,16 +151,16 @@ entry: ; 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 diff --git a/llvm/test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s b/llvm/test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s index b0ac916..eee6d1c 100644 --- a/llvm/test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s +++ b/llvm/test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s @@ -39,10 +39,10 @@ b: // 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: diff --git a/llvm/test/MC/ARM/dwarf-asm-multiple-sections.s b/llvm/test/MC/ARM/dwarf-asm-multiple-sections.s index 72115cc..141d584 100644 --- a/llvm/test/MC/ARM/dwarf-asm-multiple-sections.s +++ b/llvm/test/MC/ARM/dwarf-asm-multiple-sections.s @@ -73,14 +73,14 @@ d: // 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: diff --git a/llvm/test/MC/ARM/dwarf-asm-nonstandard-section.s b/llvm/test/MC/ARM/dwarf-asm-nonstandard-section.s index 9d1abbf..deb2025 100644 --- a/llvm/test/MC/ARM/dwarf-asm-nonstandard-section.s +++ b/llvm/test/MC/ARM/dwarf-asm-nonstandard-section.s @@ -33,8 +33,8 @@ b: // 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: diff --git a/llvm/test/MC/ARM/dwarf-asm-single-section.s b/llvm/test/MC/ARM/dwarf-asm-single-section.s index 781319f..16fd79f 100644 --- a/llvm/test/MC/ARM/dwarf-asm-single-section.s +++ b/llvm/test/MC/ARM/dwarf-asm-single-section.s @@ -33,8 +33,8 @@ a: // 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: diff --git a/llvm/test/MC/AsmParser/directive_file-g.s b/llvm/test/MC/AsmParser/directive_file-g.s index fd270c8..bbf6fbd 100644 --- a/llvm/test/MC/AsmParser/directive_file-g.s +++ b/llvm/test/MC/AsmParser/directive_file-g.s @@ -20,5 +20,5 @@ foo: # 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
diff --git a/llvm/test/MC/AsmParser/directive_loc_2.s b/llvm/test/MC/AsmParser/directive_loc_2.s index aca1e703..1cdbc2b 100644 --- a/llvm/test/MC/AsmParser/directive_loc_2.s +++ b/llvm/test/MC/AsmParser/directive_loc_2.s @@ -17,9 +17,9 @@ # 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 diff --git a/llvm/test/MC/AsmParser/line-marker-inside-macro.s b/llvm/test/MC/AsmParser/line-marker-inside-macro.s index ee6ddb8..2afd2fb 100644 --- a/llvm/test/MC/AsmParser/line-marker-inside-macro.s +++ b/llvm/test/MC/AsmParser/line-marker-inside-macro.s @@ -10,5 +10,5 @@ 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 diff --git a/llvm/test/MC/ELF/discriminator.s b/llvm/test/MC/ELF/discriminator.s index 77e46c9..6df3f88 100644 --- a/llvm/test/MC/ELF/discriminator.s +++ b/llvm/test/MC/ELF/discriminator.s @@ -56,6 +56,6 @@ foo: # 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 diff --git a/llvm/test/MC/MachO/gen-dwarf-cpp.s b/llvm/test/MC/MachO/gen-dwarf-cpp.s index 5289d00..48aac74 100644 --- a/llvm/test/MC/MachO/gen-dwarf-cpp.s +++ b/llvm/test/MC/MachO/gen-dwarf-cpp.s @@ -24,6 +24,6 @@ L1: leave // 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 diff --git a/llvm/test/MC/MachO/gen-dwarf.s b/llvm/test/MC/MachO/gen-dwarf.s index a4b979a..ab0ea03 100644 --- a/llvm/test/MC/MachO/gen-dwarf.s +++ b/llvm/test/MC/MachO/gen-dwarf.s @@ -95,10 +95,10 @@ _x: .long 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 diff --git a/llvm/test/tools/dsymutil/X86/basic-linking-x86.test b/llvm/test/tools/dsymutil/X86/basic-linking-x86.test index 13ea085..d5a0e42 100644 --- a/llvm/test/tools/dsymutil/X86/basic-linking-x86.test +++ b/llvm/test/tools/dsymutil/X86/basic-linking-x86.test @@ -156,38 +156,38 @@ 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 diff --git a/llvm/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test b/llvm/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test index 15c3d87..0ef2b98 100644 --- a/llvm/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test +++ b/llvm/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test @@ -141,43 +141,43 @@ 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: diff --git a/llvm/test/tools/dsymutil/X86/basic-lto-linking-x86.test b/llvm/test/tools/dsymutil/X86/basic-lto-linking-x86.test index 3fdb3bf..ac70343 100644 --- a/llvm/test/tools/dsymutil/X86/basic-lto-linking-x86.test +++ b/llvm/test/tools/dsymutil/X86/basic-lto-linking-x86.test @@ -153,30 +153,30 @@ 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: diff --git a/llvm/test/tools/llvm-dwarfdump/ARM/aligned_line_tables.s b/llvm/test/tools/llvm-dwarfdump/ARM/aligned_line_tables.s index f59ce7a..5355083 100644 --- a/llvm/test/tools/llvm-dwarfdump/ARM/aligned_line_tables.s +++ b/llvm/test/tools/llvm-dwarfdump/ARM/aligned_line_tables.s @@ -15,9 +15,9 @@ /// 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: @@ -29,9 +29,9 @@ // 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: diff --git a/llvm/test/tools/llvm-dwarfdump/X86/brief.s b/llvm/test/tools/llvm-dwarfdump/X86/brief.s index 090c9be..883b071 100644 --- a/llvm/test/tools/llvm-dwarfdump/X86/brief.s +++ b/llvm/test/tools/llvm-dwarfdump/X86/brief.s @@ -16,11 +16,11 @@ # 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: diff --git a/llvm/test/tools/llvm-dwarfdump/X86/debug-line-dw-lne-end-sequence.s b/llvm/test/tools/llvm-dwarfdump/X86/debug-line-dw-lne-end-sequence.s index c9a252b..e4456da 100644 --- a/llvm/test/tools/llvm-dwarfdump/X86/debug-line-dw-lne-end-sequence.s +++ b/llvm/test/tools/llvm-dwarfdump/X86/debug-line-dw-lne-end-sequence.s @@ -5,11 +5,11 @@ # 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: diff --git a/llvm/test/tools/llvm-dwarfdump/X86/debug-line-dw-lns-copy.s b/llvm/test/tools/llvm-dwarfdump/X86/debug-line-dw-lns-copy.s index c1c4f1a..bab80df 100644 --- a/llvm/test/tools/llvm-dwarfdump/X86/debug-line-dw-lns-copy.s +++ b/llvm/test/tools/llvm-dwarfdump/X86/debug-line-dw-lns-copy.s @@ -1,11 +1,11 @@ # 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: diff --git a/llvm/test/tools/llvm-dwarfdump/X86/debug-line.s b/llvm/test/tools/llvm-dwarfdump/X86/debug-line.s index 1a35047..5a83dba 100644 --- a/llvm/test/tools/llvm-dwarfdump/X86/debug-line.s +++ b/llvm/test/tools/llvm-dwarfdump/X86/debug-line.s @@ -39,11 +39,11 @@ # 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: diff --git a/llvm/test/tools/llvm-dwarfdump/X86/debug_line_dwarf64_large_table.s b/llvm/test/tools/llvm-dwarfdump/X86/debug_line_dwarf64_large_table.s index a9c49eb..2a779c0 100644 --- a/llvm/test/tools/llvm-dwarfdump/X86/debug_line_dwarf64_large_table.s +++ b/llvm/test/tools/llvm-dwarfdump/X86/debug_line_dwarf64_large_table.s @@ -18,7 +18,7 @@ # 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) diff --git a/llvm/test/tools/llvm-dwarfdump/X86/debug_line_invalid.test b/llvm/test/tools/llvm-dwarfdump/X86/debug_line_invalid.test index 022476a..dade4e9 100644 --- a/llvm/test/tools/llvm-dwarfdump/X86/debug_line_invalid.test +++ b/llvm/test/tools/llvm-dwarfdump/X86/debug_line_invalid.test @@ -40,8 +40,8 @@ # 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 diff --git a/llvm/test/tools/llvm-dwarfdump/X86/debug_line_offset.test b/llvm/test/tools/llvm-dwarfdump/X86/debug_line_offset.test index 8b8c7bc..dfd6434 100644 --- a/llvm/test/tools/llvm-dwarfdump/X86/debug_line_offset.test +++ b/llvm/test/tools/llvm-dwarfdump/X86/debug_line_offset.test @@ -2,12 +2,12 @@ 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 \ @@ -15,14 +15,14 @@ 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 diff --git a/llvm/test/tools/llvm-dwarfdump/X86/verbose.test b/llvm/test/tools/llvm-dwarfdump/X86/verbose.test index c2fde6b..0e74fc7 100644 --- a/llvm/test/tools/llvm-dwarfdump/X86/verbose.test +++ b/llvm/test/tools/llvm-dwarfdump/X86/verbose.test @@ -15,18 +15,18 @@ # 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: diff --git a/llvm/test/tools/llvm-dwarfdump/XCOFF/basic.test b/llvm/test/tools/llvm-dwarfdump/XCOFF/basic.test index f1ff35a..0f08b20 100644 --- a/llvm/test/tools/llvm-dwarfdump/XCOFF/basic.test +++ b/llvm/test/tools/llvm-dwarfdump/XCOFF/basic.test @@ -127,12 +127,12 @@ # 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 @@ -257,12 +257,12 @@ # 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 diff --git a/llvm/test/tools/llvm-symbolizer/only-empty-ranges.s b/llvm/test/tools/llvm-symbolizer/only-empty-ranges.s index d28f2c9..8f00c45 100644 --- a/llvm/test/tools/llvm-symbolizer/only-empty-ranges.s +++ b/llvm/test/tools/llvm-symbolizer/only-empty-ranges.s @@ -11,13 +11,13 @@ # 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 diff --git a/llvm/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp b/llvm/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp index 9c5e1c1..8711867 100644 --- a/llvm/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp +++ b/llvm/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp @@ -1554,8 +1554,10 @@ TEST_F(DebugLineBasicFixture, VerboseOutput) { 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(), @@ -1569,7 +1571,7 @@ TEST_F(DebugLineBasicFixture, VerboseOutput) { 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)"); @@ -1588,10 +1590,10 @@ TEST_F(DebugLineBasicFixture, VerboseOutput) { 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); } |