diff options
Diffstat (limited to 'llvm/test/Transforms')
46 files changed, 256 insertions, 256 deletions
diff --git a/llvm/test/Transforms/AddDiscriminators/basic.ll b/llvm/test/Transforms/AddDiscriminators/basic.ll index 23176406481..7c8b3d3a7ce 100644 --- a/llvm/test/Transforms/AddDiscriminators/basic.ll +++ b/llvm/test/Transforms/AddDiscriminators/basic.ll @@ -50,10 +50,10 @@ attributes #0 = { nounwind uwtable "less-precise-fpmad"="false" "no-frame-pointe !7 = !{i32 2, !"Dwarf Version", i32 4} !8 = !{i32 1, !"Debug Info Version", i32 2} !9 = !{!"clang version 3.5 "} -!10 = !{i32 3, i32 0, !11, null} +!10 = !MDLocation(line: 3, scope: !11) !11 = !{!"0xb\003\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [basic.c] -!12 = !{i32 4, i32 0, !4, null} +!12 = !MDLocation(line: 4, scope: !4) -; CHECK: !12 = !{i32 3, i32 0, !13, null} +; CHECK: !12 = !MDLocation(line: 3, scope: !13) ; CHECK: !13 = !{!"0xb\001", !1, !11} ; [ DW_TAG_lexical_block ] [./basic.c] -; CHECK: !14 = !{i32 4, i32 0, !4, null} +; CHECK: !14 = !MDLocation(line: 4, scope: !4) diff --git a/llvm/test/Transforms/AddDiscriminators/first-only.ll b/llvm/test/Transforms/AddDiscriminators/first-only.ll index a7f3e68c04f..153cfc8a44c 100644 --- a/llvm/test/Transforms/AddDiscriminators/first-only.ll +++ b/llvm/test/Transforms/AddDiscriminators/first-only.ll @@ -60,23 +60,23 @@ attributes #0 = { nounwind uwtable "less-precise-fpmad"="false" "no-frame-pointe !7 = !{i32 2, !"Dwarf Version", i32 4} !8 = !{i32 1, !"Debug Info Version", i32 2} !9 = !{!"clang version 3.5 (trunk 199750) (llvm/trunk 199751)"} -!10 = !{i32 3, i32 0, !11, null} +!10 = !MDLocation(line: 3, scope: !11) !11 = !{!"0xb\003\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [first-only.c] ; CHECK: !11 = !{!"0xb\003\000\000", !1, !4} -!12 = !{i32 3, i32 0, !13, null} +!12 = !MDLocation(line: 3, scope: !13) !13 = !{!"0xb\003\000\001", !1, !11} ; [ DW_TAG_lexical_block ] [first-only.c] ; CHECK: !13 = !{!"0xb\001", !1, !14} ; [ DW_TAG_lexical_block ] [./first-only.c] -!14 = !{i32 4, i32 0, !13, null} +!14 = !MDLocation(line: 4, scope: !13) ; CHECK: !14 = !{!"0xb\003\000\001", !1, !11} -!15 = !{i32 5, i32 0, !13, null} -; CHECK: !15 = !{i32 4, i32 0, !14, null} +!15 = !MDLocation(line: 5, scope: !13) +; CHECK: !15 = !MDLocation(line: 4, scope: !14) -!16 = !{i32 6, i32 0, !4, null} -; CHECK: !16 = !{i32 5, i32 0, !14, null} -; CHECK: !17 = !{i32 6, i32 0, !4, null} +!16 = !MDLocation(line: 6, scope: !4) +; CHECK: !16 = !MDLocation(line: 5, scope: !14) +; CHECK: !17 = !MDLocation(line: 6, scope: !4) diff --git a/llvm/test/Transforms/AddDiscriminators/multiple.ll b/llvm/test/Transforms/AddDiscriminators/multiple.ll index daa4751e637..5e552a87bbb 100644 --- a/llvm/test/Transforms/AddDiscriminators/multiple.ll +++ b/llvm/test/Transforms/AddDiscriminators/multiple.ll @@ -61,11 +61,11 @@ attributes #0 = { nounwind uwtable "less-precise-fpmad"="false" "no-frame-pointe !7 = !{i32 2, !"Dwarf Version", i32 4} !8 = !{i32 1, !"Debug Info Version", i32 2} !9 = !{!"clang version 3.5 (trunk 199750) (llvm/trunk 199751)"} -!10 = !{i32 3, i32 0, !11, null} +!10 = !MDLocation(line: 3, scope: !11) !11 = !{!"0xb\003\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [multiple.c] -!12 = !{i32 4, i32 0, !4, null} +!12 = !MDLocation(line: 4, scope: !4) -; CHECK: !12 = !{i32 3, i32 0, !13, null} +; CHECK: !12 = !MDLocation(line: 3, scope: !13) ; CHECK: !13 = !{!"0xb\001", !1, !11} ; [ DW_TAG_lexical_block ] [./multiple.c] -; CHECK: !14 = !{i32 3, i32 0, !15, null} +; CHECK: !14 = !MDLocation(line: 3, scope: !15) ; CHECK: !15 = !{!"0xb\002", !1, !11} ; [ DW_TAG_lexical_block ] [./multiple.c] diff --git a/llvm/test/Transforms/AddDiscriminators/no-discriminators.ll b/llvm/test/Transforms/AddDiscriminators/no-discriminators.ll index 6fa1c8f0f3d..dd7faf0a71e 100644 --- a/llvm/test/Transforms/AddDiscriminators/no-discriminators.ll +++ b/llvm/test/Transforms/AddDiscriminators/no-discriminators.ll @@ -63,9 +63,9 @@ attributes #1 = { nounwind readnone } !11 = !{i32 1, !"Debug Info Version", i32 2} !12 = !{!"clang version 3.5.0 "} !13 = !{!"0x101\00i\0016777217\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [i] [line 1] -!14 = !{i32 1, i32 0, !4, null} -!15 = !{i32 2, i32 0, !16, null} -; CHECK: !15 = !{i32 2, i32 0, !16, null} +!14 = !MDLocation(line: 1, scope: !4) +!15 = !MDLocation(line: 2, scope: !16) +; CHECK: !15 = !MDLocation(line: 2, scope: !16) !16 = !{!"0xb\002\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [./no-discriminators] ; CHECK: !16 = !{!"0xb\002\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [./no-discriminators] -!17 = !{i32 3, i32 0, !4, null} +!17 = !MDLocation(line: 3, scope: !4) diff --git a/llvm/test/Transforms/ArgumentPromotion/dbg.ll b/llvm/test/Transforms/ArgumentPromotion/dbg.ll index dfc67d67c03..65cf3678bd9 100644 --- a/llvm/test/Transforms/ArgumentPromotion/dbg.ll +++ b/llvm/test/Transforms/ArgumentPromotion/dbg.ll @@ -20,7 +20,7 @@ define void @caller(i32** %Y) { !llvm.dbg.cu = !{!3} !0 = !{i32 2, !"Debug Info Version", i32 2} -!1 = !{i32 8, i32 0, !2, null} +!1 = !MDLocation(line: 8, scope: !2) !2 = !{!"0x2e\00test\00test\00\003\001\001\000\006\00256\000\003", null, null, null, null, void (i32**)* @test, null, null, null} ; [ DW_TAG_subprogram ] !3 = !{!"0x11\004\00clang version 3.5.0 \000\00\000\00\002", null, null, null, !4, null, null} ; [ DW_TAG_compile_unit ] [/usr/local/google/home/blaikie/dev/scratch/pr20038/reduce/<stdin>] [DW_LANG_C_plus_plus] !4 = !{!2} diff --git a/llvm/test/Transforms/DeadArgElim/2010-04-30-DbgInfo.ll b/llvm/test/Transforms/DeadArgElim/2010-04-30-DbgInfo.ll index 8ea9429ee91..dd283aebc1d 100644 --- a/llvm/test/Transforms/DeadArgElim/2010-04-30-DbgInfo.ll +++ b/llvm/test/Transforms/DeadArgElim/2010-04-30-DbgInfo.ll @@ -58,7 +58,7 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !10 = !{!"0x101\00len\009\000", !1, !2, !9} ; [ DW_TAG_arg_variable ] !11 = !{!"0x101\00hash\0010\000", !1, !2, !9} ; [ DW_TAG_arg_variable ] !12 = !{!"0x101\00flags\0011\000", !1, !2, !9} ; [ DW_TAG_arg_variable ] -!13 = !{i32 13, i32 0, !14, null} +!13 = !MDLocation(line: 13, scope: !14) !14 = !{!"0xb\0012\000\000", !28, !1} ; [ DW_TAG_lexical_block ] !15 = !{!"0x101\00name\0017\000", !16, !2, !6} ; [ DW_TAG_arg_variable ] !16 = !{!"0x2e\00add_name_internal\00add_name_internal\00add_name_internal\0022\001\001\000\006\000\000\000", !28, !2, !17, null, null, null, null, null} ; [ DW_TAG_subprogram ] @@ -69,10 +69,10 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !21 = !{!"0x101\00hash\0019\000", !16, !2, !9} ; [ DW_TAG_arg_variable ] !22 = !{!"0x101\00extra\0020\000", !16, !2, !19} ; [ DW_TAG_arg_variable ] !23 = !{!"0x101\00flags\0021\000", !16, !2, !9} ; [ DW_TAG_arg_variable ] -!24 = !{i32 23, i32 0, !25, null} +!24 = !MDLocation(line: 23, scope: !25) !25 = !{!"0xb\0022\000\000", !28, !16} ; [ DW_TAG_lexical_block ] -!26 = !{i32 24, i32 0, !25, null} -!27 = !{i32 26, i32 0, !25, null} +!26 = !MDLocation(line: 24, scope: !25) +!27 = !MDLocation(line: 26, scope: !25) !28 = !{!"tail.c", !"/Users/echeng/LLVM/radars/r7927803/"} !29 = !{i32 0} !30 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/Transforms/DeadArgElim/dbginfo.ll b/llvm/test/Transforms/DeadArgElim/dbginfo.ll index 5a4173f38a1..5bbf821ef21 100644 --- a/llvm/test/Transforms/DeadArgElim/dbginfo.ll +++ b/llvm/test/Transforms/DeadArgElim/dbginfo.ll @@ -62,9 +62,9 @@ attributes #2 = { nounwind readnone } !12 = !{i32 2, !"Dwarf Version", i32 4} !13 = !{i32 2, !"Debug Info Version", i32 2} !14 = !{!"clang version 3.6.0 "} -!15 = !{i32 5, i32 3, !4, null} -!16 = !{i32 6, i32 1, !4, null} +!15 = !MDLocation(line: 5, column: 3, scope: !4) +!16 = !MDLocation(line: 6, column: 1, scope: !4) !17 = !{!"0x101\00\0016777217\000", !8, !5, !11} ; [ DW_TAG_arg_variable ] [line 1] !18 = !{!"0x102"} ; [ DW_TAG_expression ] -!19 = !{i32 1, i32 19, !8, null} -!20 = !{i32 2, i32 1, !8, null} +!19 = !MDLocation(line: 1, column: 19, scope: !8) +!20 = !MDLocation(line: 2, column: 1, scope: !8) diff --git a/llvm/test/Transforms/GCOVProfiling/function-numbering.ll b/llvm/test/Transforms/GCOVProfiling/function-numbering.ll index 32bc534cb46..487f4ca01a6 100644 --- a/llvm/test/Transforms/GCOVProfiling/function-numbering.ll +++ b/llvm/test/Transforms/GCOVProfiling/function-numbering.ll @@ -52,5 +52,5 @@ define void @baz() { !9 = !{i32 2, !"Dwarf Version", i32 2} !10 = !{i32 2, !"Debug Info Version", i32 2} !11 = !{!"clang version 3.6.0 "} -!12 = !{i32 1, i32 13, !4, null} -!13 = !{i32 3, i32 13, !8, null} +!12 = !MDLocation(line: 1, column: 13, scope: !4) +!13 = !MDLocation(line: 3, column: 13, scope: !8) diff --git a/llvm/test/Transforms/GCOVProfiling/global-ctor.ll b/llvm/test/Transforms/GCOVProfiling/global-ctor.ll index 38137dc32f5..9a9b7cecce7 100644 --- a/llvm/test/Transforms/GCOVProfiling/global-ctor.ll +++ b/llvm/test/Transforms/GCOVProfiling/global-ctor.ll @@ -51,6 +51,6 @@ attributes #1 = { "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" " !10 = !{i32 2, !"Dwarf Version", i32 4} !11 = !{i32 2, !"Debug Info Version", i32 2} !12 = !{!"clang version 3.5.0 (trunk 210217)"} -!13 = !{i32 2, i32 0, !4, null} -!14 = !{i32 0, i32 0, !15, null} +!13 = !MDLocation(line: 2, scope: !4) +!14 = !MDLocation(line: 0, scope: !15) !15 = !{!"0xb\000", !5, !8} ; [ DW_TAG_lexical_block ] [/home/nlewycky/global-ctor.ll] diff --git a/llvm/test/Transforms/GCOVProfiling/linezero.ll b/llvm/test/Transforms/GCOVProfiling/linezero.ll index 7272ebe4cd1..cf0fcd2cc82 100644 --- a/llvm/test/Transforms/GCOVProfiling/linezero.ll +++ b/llvm/test/Transforms/GCOVProfiling/linezero.ll @@ -124,19 +124,19 @@ attributes #3 = { noreturn nounwind } !27 = !{!"0x100\00__range\000\0064", !28, null, !29} ; [ DW_TAG_auto_variable ] [__range] [line 0] !28 = !{!"0xb\0051\000\000", !5, !15} ; [ DW_TAG_lexical_block ] [./linezero.cc] !29 = !{!"0x42\00\000\000\000\000\000", null, null, !"_ZTS6vector"} ; [ DW_TAG_rvalue_reference_type ] [line 0, size 0, align 0, offset 0] [from _ZTS6vector] -!30 = !{i32 0, i32 0, !28, null} -!31 = !{i32 51, i32 0, !28, null} +!30 = !MDLocation(line: 0, scope: !28) +!31 = !MDLocation(line: 51, scope: !28) !32 = !{!"0x100\00__begin\000\0064", !28, null, !10} ; [ DW_TAG_auto_variable ] [__begin] [line 0] !33 = !{!"0x100\00__end\000\0064", !28, null, !10} ; [ DW_TAG_auto_variable ] [__end] [line 0] -!34 = !{i32 51, i32 0, !35, null} +!34 = !MDLocation(line: 51, scope: !35) !35 = !{!"0xb\0051\000\005", !5, !36} ; [ DW_TAG_lexical_block ] [./linezero.cc] !36 = !{!"0xb\0051\000\001", !5, !28} ; [ DW_TAG_lexical_block ] [./linezero.cc] !37 = !{!"0x100\00spec\0051\000", !28, !16, !11} ; [ DW_TAG_auto_variable ] [spec] [line 51] -!38 = !{i32 51, i32 0, !39, null} +!38 = !MDLocation(line: 51, scope: !39) !39 = !{!"0xb\0051\000\002", !5, !28} ; [ DW_TAG_lexical_block ] [./linezero.cc] -!40 = !{i32 51, i32 0, !41, null} +!40 = !MDLocation(line: 51, scope: !41) !41 = !{!"0xb\0051\000\004", !5, !28} ; [ DW_TAG_lexical_block ] [./linezero.cc] -!42 = !{i32 51, i32 0, !43, null} +!42 = !MDLocation(line: 51, scope: !43) !43 = !{!"0xb\0051\000\003", !5, !28} ; [ DW_TAG_lexical_block ] [./linezero.cc] -!44 = !{i32 52, i32 0, !15, null} -!45 = !{i32 54, i32 0, !20, null} +!44 = !MDLocation(line: 52, scope: !15) +!45 = !MDLocation(line: 54, scope: !20) diff --git a/llvm/test/Transforms/GCOVProfiling/linkagename.ll b/llvm/test/Transforms/GCOVProfiling/linkagename.ll index 4f2daca13de..c30d4a61ced 100644 --- a/llvm/test/Transforms/GCOVProfiling/linkagename.ll +++ b/llvm/test/Transforms/GCOVProfiling/linkagename.ll @@ -21,7 +21,7 @@ entry: !5 = !{!"0x2e\00foo\00foo\00_Z3foov\001\000\001\000\006\00256\000\001", !1, !1, !6, null, void ()* @_Z3foov, null, null, !3} ; [ DW_TAG_subprogram ] [line 1] [def] [foo] !6 = !{!"0x15\00\000\000\000\000\000\000", i32 0, null, null, !7, i32 0} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ] !7 = !{null} -!8 = !{i32 1, i32 0, !5, null} +!8 = !MDLocation(line: 1, scope: !5) !10 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/Transforms/GCOVProfiling/return-block.ll b/llvm/test/Transforms/GCOVProfiling/return-block.ll index 3db2a92f555..f0be3d21aeb 100644 --- a/llvm/test/Transforms/GCOVProfiling/return-block.ll +++ b/llvm/test/Transforms/GCOVProfiling/return-block.ll @@ -52,11 +52,11 @@ attributes #2 = { nounwind } !11 = !{i32 2, !"Dwarf Version", i32 4} !12 = !{i32 2, !"Debug Info Version", i32 2} !13 = !{!"clang version 3.6.0 (trunk 223182)"} -!14 = !{i32 6, i32 3, !4, null} -!15 = !{i32 7, i32 7, !4, null} -!16 = !{i32 8, i32 5, !17, null} +!14 = !MDLocation(line: 6, column: 3, scope: !4) +!15 = !MDLocation(line: 7, column: 7, scope: !4) +!16 = !MDLocation(line: 8, column: 5, scope: !17) !17 = !{!"0xb\007\007\000", !1, !4} ; [ DW_TAG_lexical_block ] [return-block.c] -!18 = !{i32 9, i32 1, !4, null} +!18 = !MDLocation(line: 9, column: 1, scope: !4) ; There should be no destination edges for block 1. ; CHECK: Block : 0 Counter : 0 diff --git a/llvm/test/Transforms/GCOVProfiling/version.ll b/llvm/test/Transforms/GCOVProfiling/version.ll index ca0bb2c0bac..9436bd657da 100644 --- a/llvm/test/Transforms/GCOVProfiling/version.ll +++ b/llvm/test/Transforms/GCOVProfiling/version.ll @@ -23,7 +23,7 @@ define void @test() { !5 = !{!"0x2e\00test\00test\00\001\000\001\000\006\00256\000\001", !10, !6, !7, null, void ()* @test, null, null, !3} ; [ DW_TAG_subprogram ] [line 1] [def] [test] !6 = !{!"0x29", !10} ; [ DW_TAG_file_type ] !7 = !{!"0x15\00\000\000\000\000\000\000", i32 0, null, null, !3, i32 0} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ] -!8 = !{i32 1, i32 0, !5, null} +!8 = !MDLocation(line: 1, scope: !5) ;; !9 is added through the echo line at the top. !10 = !{!"<stdin>", !"."} !11 = !{!"version", !"/usr/local/google/home/nlewycky"} diff --git a/llvm/test/Transforms/GlobalOpt/2009-03-05-dbg.ll b/llvm/test/Transforms/GlobalOpt/2009-03-05-dbg.ll index c97d5467750..049eef10eb7 100644 --- a/llvm/test/Transforms/GlobalOpt/2009-03-05-dbg.ll +++ b/llvm/test/Transforms/GlobalOpt/2009-03-05-dbg.ll @@ -62,18 +62,18 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !4 = !{!"0x2e\00foo\00foo\00foo\004\000\001\000\006\000\000\000", i32 0, !1, !5, null, null, null, null, null} ; [ DW_TAG_subprogram ] !5 = !{!"0x15\00\000\000\000\000\000\000", !1, null, null, !6, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ] !6 = !{!2, !2} -!7 = !{i32 5, i32 0, !8, null} +!7 = !MDLocation(line: 5, scope: !8) !8 = !{!"0xb\000\000\000", !20, !4} ; [ DW_TAG_lexical_block ] -!9 = !{i32 6, i32 0, !8, null} -!10 = !{i32 7, i32 0, !8, null} -!11 = !{i32 9, i32 0, !8, null} -!12 = !{i32 11, i32 0, !8, null} -!13 = !{i32 14, i32 0, !14, null} +!9 = !MDLocation(line: 6, scope: !8) +!10 = !MDLocation(line: 7, scope: !8) +!11 = !MDLocation(line: 9, scope: !8) +!12 = !MDLocation(line: 11, scope: !8) +!13 = !MDLocation(line: 14, scope: !14) !14 = !{!"0xb\000\000\000", !20, !15} ; [ DW_TAG_lexical_block ] !15 = !{!"0x2e\00bar\00bar\00bar\0013\000\001\000\006\000\000\000", i32 0, !1, !16, null, null, null, null, null} ; [ DW_TAG_subprogram ] !16 = !{!"0x15\00\000\000\000\000\000\000", !1, null, null, !17, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ] !17 = !{!2} -!18 = !{i32 15, i32 0, !14, null} -!19 = !{i32 16, i32 0, !14, null} +!18 = !MDLocation(line: 15, scope: !14) +!19 = !MDLocation(line: 16, scope: !14) !20 = !{!"g.c", !"/tmp"} !21 = !{i32 0} diff --git a/llvm/test/Transforms/Inline/debug-invoke.ll b/llvm/test/Transforms/Inline/debug-invoke.ll index 2e4f3dd27f4..4815e689b8a 100644 --- a/llvm/test/Transforms/Inline/debug-invoke.ll +++ b/llvm/test/Transforms/Inline/debug-invoke.ll @@ -5,8 +5,8 @@ ; CHECK: invoke void @test() ; CHECK-NEXT: to label {{.*}} unwind label {{.*}}, !dbg [[INL_LOC:!.*]] ; CHECK: [[EMPTY:.*]] = !{} -; CHECK: [[INL_LOC]] = !{i32 1, i32 0, [[EMPTY]], [[INL_AT:.*]]} -; CHECK: [[INL_AT]] = !{i32 2, i32 0, [[EMPTY]], null} +; CHECK: [[INL_LOC]] = !MDLocation(line: 1, scope: [[EMPTY]], inlinedAt: [[INL_AT:.*]]) +; CHECK: [[INL_AT]] = !MDLocation(line: 2, scope: [[EMPTY]]) declare void @test() declare i32 @__gxx_personality_v0(...) @@ -33,5 +33,5 @@ lpad: !llvm.module.flags = !{!1} !1 = !{i32 2, !"Debug Info Version", i32 2} !2 = !{} -!3 = !{i32 1, i32 0, !2, null} -!4 = !{i32 2, i32 0, !2, null} +!3 = !MDLocation(line: 1, scope: !2) +!4 = !MDLocation(line: 2, scope: !2) diff --git a/llvm/test/Transforms/Inline/inline_dbg_declare.ll b/llvm/test/Transforms/Inline/inline_dbg_declare.ll index 3e03595b7cc..563cde31416 100644 --- a/llvm/test/Transforms/Inline/inline_dbg_declare.ll +++ b/llvm/test/Transforms/Inline/inline_dbg_declare.ll @@ -85,12 +85,12 @@ attributes #1 = { nounwind readnone } !15 = !{!"clang version 3.6.0 (trunk)"}
!16 = !{!"0x101\00x\0016777217\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [x] [line 1]
!17 = !{!"0x102"} ; [ DW_TAG_expression ]
-!18 = !{i32 1, i32 17, !4, null}
-!19 = !{i32 3, i32 5, !4, null}
+!18 = !MDLocation(line: 1, column: 17, scope: !4)
+!19 = !MDLocation(line: 3, column: 5, scope: !4)
!20 = !{!"0x101\00dst\0016777222\000", !9, !5, !12} ; [ DW_TAG_arg_variable ] [dst] [line 6]
-!21 = !{i32 6, i32 17, !9, null}
-!22 = !{i32 8, i32 14, !9, null}
-!23 = !{i32 9, i32 1, !9, null}
+!21 = !MDLocation(line: 6, column: 17, scope: !9)
+!22 = !MDLocation(line: 8, column: 14, scope: !9)
+!23 = !MDLocation(line: 9, column: 1, scope: !9)
; CHECK: [[m23]] = !{!"0x101\00x\0016777217\000", !4, !5, !8, !22} ; [ DW_TAG_arg_variable ] [x] [line 1]
-; CHECK: [[m24]] = !{i32 1, i32 17, !4, !22}
+; CHECK: [[m24]] = !MDLocation(line: 1, column: 17, scope: !4, inlinedAt: !22)
diff --git a/llvm/test/Transforms/InstCombine/debug-line.ll b/llvm/test/Transforms/InstCombine/debug-line.ll index 08492c05977..1946576183c 100644 --- a/llvm/test/Transforms/InstCombine/debug-line.ll +++ b/llvm/test/Transforms/InstCombine/debug-line.ll @@ -20,9 +20,9 @@ declare i32 @printf(i8*, ...) !2 = !{!"0x11\0012\00clang\001\00\000\00\000", !8, !4, !4, !9, null, null} ; [ DW_TAG_compile_unit ] !3 = !{!"0x15\00\000\000\000\000\000\000", !8, !1, null, !4, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ] !4 = !{null} -!5 = !{i32 5, i32 2, !6, null} +!5 = !MDLocation(line: 5, column: 2, scope: !6) !6 = !{!"0xb\004\0012\000", !8, !0} ; [ DW_TAG_lexical_block ] -!7 = !{i32 6, i32 1, !6, null} +!7 = !MDLocation(line: 6, column: 1, scope: !6) !8 = !{!"m.c", !"/private/tmp"} !9 = !{!0} !10 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/Transforms/InstCombine/debuginfo.ll b/llvm/test/Transforms/InstCombine/debuginfo.ll index 4b93dbbf784..ae72f700039 100644 --- a/llvm/test/Transforms/InstCombine/debuginfo.ll +++ b/llvm/test/Transforms/InstCombine/debuginfo.ll @@ -44,10 +44,10 @@ entry: !10 = !{!"0x16\00size_t\0080\000\000\000\000", !27, !3, !11} ; [ DW_TAG_typedef ] !11 = !{!"0x16\00__darwin_size_t\0090\000\000\000\000", !27, !3, !12} ; [ DW_TAG_typedef ] !12 = !{!"0x24\00long unsigned int\000\0064\0064\000\000\007", null, !3} ; [ DW_TAG_base_type ] -!16 = !{i32 78, i32 28, !1, null} -!18 = !{i32 78, i32 40, !1, null} -!20 = !{i32 78, i32 54, !1, null} -!21 = !{i32 80, i32 3, !22, null} +!16 = !MDLocation(line: 78, column: 28, scope: !1) +!18 = !MDLocation(line: 78, column: 40, scope: !1) +!20 = !MDLocation(line: 78, column: 54, scope: !1) +!21 = !MDLocation(line: 80, column: 3, scope: !22) !22 = !{!"0xb\0080\003\007", !27, !23} ; [ DW_TAG_lexical_block ] !23 = !{!"0xb\0079\001\006", !27, !1} ; [ DW_TAG_lexical_block ] !24 = !{!1} diff --git a/llvm/test/Transforms/LICM/debug-value.ll b/llvm/test/Transforms/LICM/debug-value.ll index 5b874a587d7..b49c559672a 100644 --- a/llvm/test/Transforms/LICM/debug-value.ll +++ b/llvm/test/Transforms/LICM/debug-value.ll @@ -47,19 +47,19 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !8 = !{null} !9 = !{!"0x2e\00daxpy\00daxpy\00\00230\000\001\000\006\00256\000\000", !25, !1, !7, i32 0, null, null, null, null} ; [ DW_TAG_subprogram ] !10 = !{!"0x2e\00dgefa\00dgefa\00\00267\000\001\000\006\00256\000\000", !25, !1, !7, null, null, null, null, null} ; [ DW_TAG_subprogram ] [line 267] [def] [scope 0] [dgefa] -!11 = !{i32 281, i32 9, !12, null} +!11 = !MDLocation(line: 281, column: 9, scope: !12) !12 = !{!"0xb\00272\005\0032", !25, !13} ; [ DW_TAG_lexical_block ] !13 = !{!"0xb\00271\005\0031", !25, !14} ; [ DW_TAG_lexical_block ] !14 = !{!"0xb\00267\001\0030", !25, !10} ; [ DW_TAG_lexical_block ] -!15 = !{i32 271, i32 5, !14, null} -!16 = !{i32 284, i32 10, !17, null} +!15 = !MDLocation(line: 271, column: 5, scope: !14) +!16 = !MDLocation(line: 284, column: 10, scope: !17) !17 = !{!"0xb\00282\009\0033", !25, !12} ; [ DW_TAG_lexical_block ] !18 = !{double undef} !19 = !{!"0x100\00temp\00268\000", !14, !1, !20} ; [ DW_TAG_auto_variable ] !20 = !{!"0x24\00double\000\0064\0064\000\000\004", null, !2} ; [ DW_TAG_base_type ] -!21 = !{i32 286, i32 14, !22, null} +!21 = !MDLocation(line: 286, column: 14, scope: !22) !22 = !{!"0xb\00285\0013\0034", !25, !17} ; [ DW_TAG_lexical_block ] -!23 = !{i32 296, i32 13, !17, null} -!24 = !{i32 313, i32 1, !14, null} +!23 = !MDLocation(line: 296, column: 13, scope: !17) +!24 = !MDLocation(line: 313, column: 1, scope: !14) !25 = !{!"/Volumes/Lalgate/work/llvm/projects/llvm-test/SingleSource/Benchmarks/CoyoteBench/lpbench.c", !"/private/tmp"} !26 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/Transforms/LoopIdiom/debug-line.ll b/llvm/test/Transforms/LoopIdiom/debug-line.ll index eed133dd1da..863df3c72d5 100644 --- a/llvm/test/Transforms/LoopIdiom/debug-line.ll +++ b/llvm/test/Transforms/LoopIdiom/debug-line.ll @@ -38,15 +38,15 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !5 = !{!"0x101\00a\0016777218\000", !0, !1, !6} ; [ DW_TAG_arg_variable ] !6 = !{!"0xf\00\000\0064\0064\000\000", null, !2, !7} ; [ DW_TAG_pointer_type ] !7 = !{!"0x24\00double\000\0064\0064\000\000\004", null, !2} ; [ DW_TAG_base_type ] -!8 = !{i32 2, i32 18, !0, null} +!8 = !MDLocation(line: 2, column: 18, scope: !0) !9 = !{i32 0} !10 = !{!"0x100\00i\003\000", !11, !1, !13} ; [ DW_TAG_auto_variable ] !11 = !{!"0xb\003\003\001", !18, !12} ; [ DW_TAG_lexical_block ] !12 = !{!"0xb\002\0021\000", !18, !0} ; [ DW_TAG_lexical_block ] !13 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !2} ; [ DW_TAG_base_type ] -!14 = !{i32 3, i32 3, !12, null} -!15 = !{i32 4, i32 5, !11, null} -!16 = !{i32 3, i32 29, !11, null} -!17 = !{i32 5, i32 1, !12, null} +!14 = !MDLocation(line: 3, column: 3, scope: !12) +!15 = !MDLocation(line: 4, column: 5, scope: !11) +!16 = !MDLocation(line: 3, column: 29, scope: !11) +!17 = !MDLocation(line: 5, column: 1, scope: !12) !18 = !{!"li.c", !"/private/tmp"} !19 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/Transforms/LoopRotate/dbgvalue.ll b/llvm/test/Transforms/LoopRotate/dbgvalue.ll index 87ff6b0283e..846b366f294 100644 --- a/llvm/test/Transforms/LoopRotate/dbgvalue.ll +++ b/llvm/test/Transforms/LoopRotate/dbgvalue.ll @@ -91,17 +91,17 @@ for.end: !4 = !{!5} !5 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !2} ; [ DW_TAG_base_type ] !6 = !{!"0x101\00x\0032\000", !0, !1, !5} ; [ DW_TAG_arg_variable ] -!7 = !{i32 32, i32 13, !0, null} +!7 = !MDLocation(line: 32, column: 13, scope: !0) !8 = !{!"0x101\00y\0032\000", !0, !1, !5} ; [ DW_TAG_arg_variable ] -!9 = !{i32 32, i32 20, !0, null} +!9 = !MDLocation(line: 32, column: 20, scope: !0) !10 = !{!"0x101\00z\0032\000", !0, !1, !5} ; [ DW_TAG_arg_variable ] -!11 = !{i32 32, i32 27, !0, null} -!12 = !{i32 33, i32 3, !13, null} +!11 = !MDLocation(line: 32, column: 27, scope: !0) +!12 = !MDLocation(line: 33, column: 3, scope: !13) !13 = !{!"0xb\0032\0030\006", !18, !0} ; [ DW_TAG_lexical_block ] -!14 = !{i32 34, i32 5, !15, null} +!14 = !MDLocation(line: 34, column: 5, scope: !15) !15 = !{!"0xb\0033\0014\007", !18, !13} ; [ DW_TAG_lexical_block ] -!16 = !{i32 36, i32 3, !13, null} -!17 = !{i32 37, i32 1, !13, null} +!16 = !MDLocation(line: 36, column: 3, scope: !13) +!17 = !MDLocation(line: 37, column: 1, scope: !13) !18 = !{!"/Volumes/Lalgate/cj/llvm/projects/llvm-test/SingleSource/Benchmarks/BenchmarkGame/recursive.c", !"/Volumes/Lalgate/cj/D/projects/llvm-test/SingleSource/Benchmarks/BenchmarkGame"} !19 = !{i32 0} !20 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/Transforms/LoopVectorize/X86/vectorization-remarks-missed.ll b/llvm/test/Transforms/LoopVectorize/X86/vectorization-remarks-missed.ll index ac94079f7ed..011ce8eac55 100644 --- a/llvm/test/Transforms/LoopVectorize/X86/vectorization-remarks-missed.ll +++ b/llvm/test/Transforms/LoopVectorize/X86/vectorization-remarks-missed.ll @@ -134,28 +134,28 @@ attributes #0 = { nounwind } !9 = !{i32 2, !"Dwarf Version", i32 2} !10 = !{i32 2, !"Debug Info Version", i32 2} !11 = !{!"clang version 3.5.0"} -!12 = !{i32 3, i32 8, !13, null} +!12 = !MDLocation(line: 3, column: 8, scope: !13) !13 = !{!"0xb\003\003\000", !1, !4} ; [ DW_TAG_lexical_block ] !14 = !{!14, !15, !15} !15 = !{!"llvm.loop.vectorize.enable", i1 true} -!16 = !{i32 4, i32 5, !17, null} +!16 = !MDLocation(line: 4, column: 5, scope: !17) !17 = !{!"0xb\003\0036\000", !1, !13} ; [ DW_TAG_lexical_block ] !18 = !{!19, !19, i64 0} !19 = !{!"int", !20, i64 0} !20 = !{!"omnipotent char", !21, i64 0} !21 = !{!"Simple C/C++ TBAA"} -!22 = !{i32 5, i32 9, !23, null} +!22 = !MDLocation(line: 5, column: 9, scope: !23) !23 = !{!"0xb\005\009\000", !1, !17} ; [ DW_TAG_lexical_block ] -!24 = !{i32 8, i32 1, !4, null} -!25 = !{i32 12, i32 8, !26, null} +!24 = !MDLocation(line: 8, column: 1, scope: !4) +!25 = !MDLocation(line: 12, column: 8, scope: !26) !26 = !{!"0xb\0012\003\000", !1, !7} ; [ DW_TAG_lexical_block ] !27 = !{!27, !28, !29} !28 = !{!"llvm.loop.interleave.count", i32 1} !29 = !{!"llvm.loop.vectorize.width", i32 1} -!30 = !{i32 13, i32 5, !26, null} -!31 = !{i32 14, i32 1, !7, null} -!32 = !{i32 18, i32 8, !33, null} +!30 = !MDLocation(line: 13, column: 5, scope: !26) +!31 = !MDLocation(line: 14, column: 1, scope: !7) +!32 = !MDLocation(line: 18, column: 8, scope: !33) !33 = !{!"0xb\0018\003\000", !1, !8} ; [ DW_TAG_lexical_block ] !34 = !{!34, !15} -!35 = !{i32 19, i32 5, !33, null} -!36 = !{i32 20, i32 1, !8, null} +!35 = !MDLocation(line: 19, column: 5, scope: !33) +!36 = !MDLocation(line: 20, column: 1, scope: !8) diff --git a/llvm/test/Transforms/LoopVectorize/X86/vectorization-remarks.ll b/llvm/test/Transforms/LoopVectorize/X86/vectorization-remarks.ll index ed37373682f..16fe370464b 100644 --- a/llvm/test/Transforms/LoopVectorize/X86/vectorization-remarks.ll +++ b/llvm/test/Transforms/LoopVectorize/X86/vectorization-remarks.ll @@ -58,17 +58,17 @@ declare void @ibar(i32*) #1 !7 = !{i32 2, !"Dwarf Version", i32 4} !8 = !{i32 1, !"Debug Info Version", i32 2} !9 = !{!"clang version 3.5.0 "} -!10 = !{i32 8, i32 3, !4, null} +!10 = !MDLocation(line: 8, column: 3, scope: !4) !11 = !{!12, !12, i64 0} !12 = !{!"int", !13, i64 0} !13 = !{!"omnipotent char", !14, i64 0} !14 = !{!"Simple C/C++ TBAA"} -!15 = !{i32 17, i32 8, !16, null} +!15 = !MDLocation(line: 17, column: 8, scope: !16) !16 = !{!"0xb\0017\008\002", !1, !17} ; [ DW_TAG_lexical_block ] [./vectorization-remarks.c] !17 = !{!"0xb\0017\008\001", !1, !18} ; [ DW_TAG_lexical_block ] [./vectorization-remarks.c] !18 = !{!"0xb\0017\003\000", !1, !4} ; [ DW_TAG_lexical_block ] [./vectorization-remarks.c] -!19 = !{i32 18, i32 5, !20, null} +!19 = !MDLocation(line: 18, column: 5, scope: !20) !20 = !{!"0xb\0017\0027\000", !1, !18} ; [ DW_TAG_lexical_block ] [./vectorization-remarks.c] !21 = !{!13, !13, i64 0} -!22 = !{i32 20, i32 3, !4, null} -!23 = !{i32 21, i32 3, !4, null} +!22 = !MDLocation(line: 20, column: 3, scope: !4) +!23 = !MDLocation(line: 21, column: 3, scope: !4) diff --git a/llvm/test/Transforms/LoopVectorize/conditional-assignment.ll b/llvm/test/Transforms/LoopVectorize/conditional-assignment.ll index bfe39db7007..38e9c4f9a61 100644 --- a/llvm/test/Transforms/LoopVectorize/conditional-assignment.ll +++ b/llvm/test/Transforms/LoopVectorize/conditional-assignment.ll @@ -46,13 +46,13 @@ attributes #0 = { nounwind } !7 = !{i32 2, !"Dwarf Version", i32 2} !8 = !{i32 2, !"Debug Info Version", i32 2} !9 = !{!"clang version 3.6.0"} -!10 = !{i32 2, i32 8, !11, null} +!10 = !MDLocation(line: 2, column: 8, scope: !11) !11 = !{!"0xb\002\003\000", !1, !4} ; [ DW_TAG_lexical_block ] -!12 = !{i32 3, i32 9, !13, null} +!12 = !MDLocation(line: 3, column: 9, scope: !13) !13 = !{!"0xb\003\009\000", !1, !11} ; [ DW_TAG_lexical_block ] !14 = !{!15, !15, i64 0} !15 = !{!"int", !16, i64 0} !16 = !{!"omnipotent char", !17, i64 0} !17 = !{!"Simple C/C++ TBAA"} -!18 = !{i32 3, i32 29, !13, null} -!19 = !{i32 4, i32 1, !4, null} +!18 = !MDLocation(line: 3, column: 29, scope: !13) +!19 = !MDLocation(line: 4, column: 1, scope: !4) diff --git a/llvm/test/Transforms/LoopVectorize/control-flow.ll b/llvm/test/Transforms/LoopVectorize/control-flow.ll index bbff5ee1587..1882c3ff9a8 100644 --- a/llvm/test/Transforms/LoopVectorize/control-flow.ll +++ b/llvm/test/Transforms/LoopVectorize/control-flow.ll @@ -65,14 +65,14 @@ attributes #0 = { nounwind } !7 = !{i32 2, !"Dwarf Version", i32 2} !8 = !{i32 2, !"Debug Info Version", i32 2} !9 = !{!"clang version 3.5.0"} -!10 = !{i32 3, i32 8, !11, null} +!10 = !MDLocation(line: 3, column: 8, scope: !11) !11 = !{!"0xb\003\003\000", !1, !4} ; [ DW_TAG_lexical_block ] -!12 = !{i32 5, i32 9, !13, null} +!12 = !MDLocation(line: 5, column: 9, scope: !13) !13 = !{!"0xb\005\009\000", !1, !14} ; [ DW_TAG_lexical_block ] !14 = !{!"0xb\004\003\000", !1, !11} ; [ DW_TAG_lexical_block ] !15 = !{!16, !16, i64 0} !16 = !{!"int", !17, i64 0} !17 = !{!"omnipotent char", !18, i64 0} !18 = !{!"Simple C/C++ TBAA"} -!19 = !{i32 8, i32 7, !13, null} -!20 = !{i32 12, i32 3, !4, null} +!19 = !MDLocation(line: 8, column: 7, scope: !13) +!20 = !MDLocation(line: 12, column: 3, scope: !4) diff --git a/llvm/test/Transforms/LoopVectorize/dbg.value.ll b/llvm/test/Transforms/LoopVectorize/dbg.value.ll index 2556c3dff80..92d31548126 100644 --- a/llvm/test/Transforms/LoopVectorize/dbg.value.ll +++ b/llvm/test/Transforms/LoopVectorize/dbg.value.ll @@ -62,9 +62,9 @@ attributes #1 = { nounwind readnone } !15 = !{i32 786465, i64 0, i64 1024} !16 = !{!"0x34\00B\00B\00\002\000\001", null, !4, !13, [1024 x i32]* @B, null} ; [ DW_TAG_variable ] !17 = !{!"0x34\00C\00C\00\003\000\001", null, !4, !13, [1024 x i32]* @C, null} ; [ DW_TAG_variable ] -!18 = !{i32 6, i32 0, !10, null} -!19 = !{i32 7, i32 0, !20, null} +!18 = !MDLocation(line: 6, scope: !10) +!19 = !MDLocation(line: 7, scope: !20) !20 = !{!"0xb\006\000\001", !25, !10} ; [ DW_TAG_lexical_block ] -!24 = !{i32 9, i32 0, !3, null} +!24 = !MDLocation(line: 9, scope: !3) !25 = !{!"test", !"/path/to/somewhere"} !26 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/Transforms/LoopVectorize/debugloc.ll b/llvm/test/Transforms/LoopVectorize/debugloc.ll index 68411bae3b9..634bf79ddf0 100644 --- a/llvm/test/Transforms/LoopVectorize/debugloc.ll +++ b/llvm/test/Transforms/LoopVectorize/debugloc.ll @@ -82,9 +82,9 @@ attributes #1 = { nounwind readnone } !16 = !{!"0x100\00i\005\000", !17, !6, !11} ; [ DW_TAG_auto_variable ] [i] [line 5] !17 = !{!"0xb\005\000\000", !5, !4} ; [ DW_TAG_lexical_block ] [/Volumes/Data/backedup/dev/os/llvm/debug/<stdin>] !18 = !{i32 2, !"Dwarf Version", i32 3} -!19 = !{i32 3, i32 0, !4, null} -!20 = !{i32 4, i32 0, !4, null} -!21 = !{i32 5, i32 0, !17, null} -!22 = !{i32 6, i32 0, !17, null} -!26 = !{i32 7, i32 0, !4, null} +!19 = !MDLocation(line: 3, scope: !4) +!20 = !MDLocation(line: 4, scope: !4) +!21 = !MDLocation(line: 5, scope: !17) +!22 = !MDLocation(line: 6, scope: !17) +!26 = !MDLocation(line: 7, scope: !4) !27 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/Transforms/LoopVectorize/no_array_bounds.ll b/llvm/test/Transforms/LoopVectorize/no_array_bounds.ll index a7f939a8445..d3bd755e6cf 100644 --- a/llvm/test/Transforms/LoopVectorize/no_array_bounds.ll +++ b/llvm/test/Transforms/LoopVectorize/no_array_bounds.ll @@ -82,20 +82,20 @@ attributes #0 = { nounwind } !7 = !{i32 2, !"Dwarf Version", i32 2} !8 = !{i32 2, !"Debug Info Version", i32 2} !9 = !{!"clang version 3.5.0"} -!10 = !{i32 4, i32 8, !11, null} +!10 = !MDLocation(line: 4, column: 8, scope: !11) !11 = !{!"0xb\004\003\000", !1, !4} ; [ DW_TAG_lexical_block ] !12 = !{!12, !13} !13 = !{!"llvm.loop.vectorize.enable", i1 true} -!14 = !{i32 5, i32 5, !15, null} +!14 = !MDLocation(line: 5, column: 5, scope: !15) !15 = !{!"0xb\004\0036\000", !1, !11} ; [ DW_TAG_lexical_block ] -!16 = !{i32 9, i32 8, !17, null} +!16 = !MDLocation(line: 9, column: 8, scope: !17) !17 = !{!"0xb\009\003\000", !1, !4} ; [ DW_TAG_lexical_block ] !18 = !{!18, !13, !19} !19 = !{!"llvm.loop.vectorize.width", i32 1} -!20 = !{i32 10, i32 5, !21, null} +!20 = !MDLocation(line: 10, column: 5, scope: !21) !21 = !{!"0xb\009\0036\000", !1, !17} ; [ DW_TAG_lexical_block ] !22 = !{!23, !23, i64 0} !23 = !{!"int", !24, i64 0} !24 = !{!"omnipotent char", !25, i64 0} !25 = !{!"Simple C/C++ TBAA"} -!26 = !{i32 12, i32 1, !4, null} +!26 = !MDLocation(line: 12, column: 1, scope: !4) diff --git a/llvm/test/Transforms/LoopVectorize/no_switch.ll b/llvm/test/Transforms/LoopVectorize/no_switch.ll index e301c28393b..64aab37592f 100644 --- a/llvm/test/Transforms/LoopVectorize/no_switch.ll +++ b/llvm/test/Transforms/LoopVectorize/no_switch.ll @@ -69,18 +69,18 @@ attributes #0 = { nounwind } !7 = !{i32 2, !"Dwarf Version", i32 2} !8 = !{i32 2, !"Debug Info Version", i32 2} !9 = !{!"clang version 3.5.0"} -!10 = !{i32 3, i32 8, !11, null} +!10 = !MDLocation(line: 3, column: 8, scope: !11) !11 = !{!"0xb\003\003\000", !1, !4} ; [ DW_TAG_lexical_block ] !12 = !{!12, !13, !13} !13 = !{!"llvm.loop.vectorize.enable", i1 true} -!14 = !{i32 4, i32 5, !15, null} +!14 = !MDLocation(line: 4, column: 5, scope: !15) !15 = !{!"0xb\003\0036\000", !1, !11} ; [ DW_TAG_lexical_block ] !16 = !{!17, !17, i64 0} !17 = !{!"int", !18, i64 0} !18 = !{!"omnipotent char", !19, i64 0} !19 = !{!"Simple C/C++ TBAA"} -!20 = !{i32 6, i32 7, !21, null} +!20 = !MDLocation(line: 6, column: 7, scope: !21) !21 = !{!"0xb\004\0018\000", !1, !15} ; [ DW_TAG_lexical_block ] -!22 = !{i32 7, i32 5, !21, null} -!23 = !{i32 9, i32 7, !21, null} -!24 = !{i32 14, i32 1, !4, null} +!22 = !MDLocation(line: 7, column: 5, scope: !21) +!23 = !MDLocation(line: 9, column: 7, scope: !21) +!24 = !MDLocation(line: 14, column: 1, scope: !4) diff --git a/llvm/test/Transforms/Mem2Reg/ConvertDebugInfo.ll b/llvm/test/Transforms/Mem2Reg/ConvertDebugInfo.ll index f443503c98b..a7369c0902b 100644 --- a/llvm/test/Transforms/Mem2Reg/ConvertDebugInfo.ll +++ b/llvm/test/Transforms/Mem2Reg/ConvertDebugInfo.ll @@ -43,9 +43,9 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !5 = !{!6, !7, !6} !6 = !{!"0x24\00double\000\0064\0064\000\000\004", !12, !2} ; [ DW_TAG_base_type ] !7 = !{!"0x24\00int\000\0032\0032\000\000\005", !12, !2} ; [ DW_TAG_base_type ] -!8 = !{i32 2, i32 0, !1, null} +!8 = !MDLocation(line: 2, scope: !1) !9 = !{!"0x101\00j\002\000", !1, !2, !6} ; [ DW_TAG_arg_variable ] -!10 = !{i32 3, i32 0, !11, null} +!10 = !MDLocation(line: 3, scope: !11) !11 = !{!"0xb\002\000\000", !12, !1} ; [ DW_TAG_lexical_block ] !12 = !{!"testfunc.c", !"/tmp"} !13 = !{i32 0} diff --git a/llvm/test/Transforms/Mem2Reg/ConvertDebugInfo2.ll b/llvm/test/Transforms/Mem2Reg/ConvertDebugInfo2.ll index 52661bba103..76d2a1aa7d2 100644 --- a/llvm/test/Transforms/Mem2Reg/ConvertDebugInfo2.ll +++ b/llvm/test/Transforms/Mem2Reg/ConvertDebugInfo2.ll @@ -39,19 +39,19 @@ return: ; preds = %entry !4 = !{!"0x15\00\000\000\000\000\000\000", !20, !2, null, !5, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ] !5 = !{null, !6} !6 = !{!"0x24\00int\000\0032\0032\000\000\005", !20, !2} ; [ DW_TAG_base_type ] -!7 = !{i32 8, i32 0, !1, null} -!8 = !{i32 9, i32 0, !1, null} +!7 = !MDLocation(line: 8, scope: !1) +!8 = !MDLocation(line: 9, scope: !1) !9 = !{!"0x101\00x\004\000", !10, !2, !6} ; [ DW_TAG_arg_variable ] !10 = !{!"0x2e\00bar\00bar\00bar\004\001\001\000\006\000\000\004", !20, !2, !11, null, null, null, null, null} ; [ DW_TAG_subprogram ] !11 = !{!"0x15\00\000\000\000\000\000\000", !20, !2, null, !12, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ] !12 = !{null, !6, !13, !14} !13 = !{!"0x24\00long int\000\0064\0064\000\000\005", !20, !2} ; [ DW_TAG_base_type ] !14 = !{!"0xf\00\000\0064\0064\000\000", !20, !2, null} ; [ DW_TAG_pointer_type ] -!15 = !{i32 4, i32 0, !10, !8} +!15 = !MDLocation(line: 4, scope: !10, inlinedAt: !8) !16 = !{!"0x101\00y\004\000", !10, !2, !13} ; [ DW_TAG_arg_variable ] !17 = !{!"0x101\00z\004\000", !10, !2, !14} ; [ DW_TAG_arg_variable ] -!18 = !{i32 5, i32 0, !10, !8} -!19 = !{i32 10, i32 0, !1, null} +!18 = !MDLocation(line: 5, scope: !10, inlinedAt: !8) +!19 = !MDLocation(line: 10, scope: !1) !20 = !{!"bar.c", !"/tmp/"} !21 = !{i32 0} !22 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/Transforms/ObjCARC/ensure-that-exception-unwind-path-is-visited.ll b/llvm/test/Transforms/ObjCARC/ensure-that-exception-unwind-path-is-visited.ll index 8cad062260b..c72566cd206 100644 --- a/llvm/test/Transforms/ObjCARC/ensure-that-exception-unwind-path-is-visited.ll +++ b/llvm/test/Transforms/ObjCARC/ensure-that-exception-unwind-path-is-visited.ll @@ -148,27 +148,27 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !34 = !{i32 1, !"Objective-C Image Info Version", i32 0} !35 = !{i32 1, !"Objective-C Image Info Section", !"__DATA, __objc_imageinfo, regular, no_dead_strip"} !36 = !{i32 4, !"Objective-C Garbage Collection", i32 0} -!37 = !{i32 11, i32 0, !13, null} +!37 = !MDLocation(line: 11, scope: !13) !38 = !{} -!39 = !{i32 15, i32 0, !26, null} -!40 = !{i32 17, i32 0, !41, null} +!39 = !MDLocation(line: 15, scope: !26) +!40 = !MDLocation(line: 17, scope: !41) !41 = !{!"0xb\0016\000\003", !60, !26} ; [ DW_TAG_lexical_block ] [/Volumes/Files/gottesmmcab/Radar/12906997/test.m] -!42 = !{i32 22, i32 0, !26, null} -!43 = !{i32 23, i32 0, !22, null} -!44 = !{i32 19, i32 0, !41, null} +!42 = !MDLocation(line: 22, scope: !26) +!43 = !MDLocation(line: 23, scope: !22) +!44 = !MDLocation(line: 19, scope: !41) !45 = !{i8 0} -!46 = !{i32 20, i32 0, !47, null} +!46 = !MDLocation(line: 20, scope: !47) !47 = !{!"0xb\0019\000\005", !60, !48} ; [ DW_TAG_lexical_block ] [/Volumes/Files/gottesmmcab/Radar/12906997/test.m] !48 = !{!"0xb\0019\000\004", !60, !26} ; [ DW_TAG_lexical_block ] [/Volumes/Files/gottesmmcab/Radar/12906997/test.m] -!49 = !{i32 21, i32 0, !47, null} -!50 = !{i32 24, i32 0, !51, null} +!49 = !MDLocation(line: 21, scope: !47) +!50 = !MDLocation(line: 24, scope: !51) !51 = !{!"0xb\0023\000\006", !60, !22} ; [ DW_TAG_lexical_block ] [/Volumes/Files/gottesmmcab/Radar/12906997/test.m] -!52 = !{i32 25, i32 0, !51, null} -!53 = !{i32 27, i32 0, !13, null} -!54 = !{i32 28, i32 0, !13, null} -!55 = !{i32 4, i32 0, !27, null} -!56 = !{i32 6, i32 0, !57, null} +!52 = !MDLocation(line: 25, scope: !51) +!53 = !MDLocation(line: 27, scope: !13) +!54 = !MDLocation(line: 28, scope: !13) +!55 = !MDLocation(line: 4, scope: !27) +!56 = !MDLocation(line: 6, scope: !57) !57 = !{!"0xb\005\000\007", !60, !27} ; [ DW_TAG_lexical_block ] [/Volumes/Files/gottesmmcab/Radar/12906997/test.m] -!58 = !{i32 7, i32 0, !57, null} +!58 = !MDLocation(line: 7, scope: !57) !60 = !{!"test.m", !"/Volumes/Files/gottesmmcab/Radar/12906997"} !61 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/Transforms/SLPVectorizer/X86/debug_info.ll b/llvm/test/Transforms/SLPVectorizer/X86/debug_info.ll index f0931d80dd4..21f51d7c612 100644 --- a/llvm/test/Transforms/SLPVectorizer/X86/debug_info.ll +++ b/llvm/test/Transforms/SLPVectorizer/X86/debug_info.ll @@ -18,8 +18,8 @@ target triple = "x86_64-apple-macosx10.7.0" ;CHECK: load <2 x double>* {{.*}}, !dbg ![[LOC]] ;CHECK: store <2 x double> {{.*}}, !dbg ![[LOC2:[0-9]+]] ;CHECK: ret -;CHECK: ![[LOC]] = !{i32 4, i32 0, -;CHECK: ![[LOC2]] = !{i32 7, i32 0, +;CHECK: ![[LOC]] = !MDLocation(line: 4, scope: +;CHECK: ![[LOC2]] = !MDLocation(line: 7, scope: define i32 @depth(double* nocapture %A, i32 %m) #0 { entry: @@ -76,14 +76,14 @@ attributes #1 = { nounwind readnone } !16 = !{!"0x100\00i\003\000", !17, !5, !8} ; [ DW_TAG_auto_variable ] [i] [line 3] !17 = !{!"0xb\003\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [/Users/nadav/file.c] !18 = !{i32 2, !"Dwarf Version", i32 2} -!19 = !{i32 1, i32 0, !4, null} +!19 = !MDLocation(line: 1, scope: !4) !20 = !{double 0.000000e+00} -!21 = !{i32 2, i32 0, !4, null} +!21 = !MDLocation(line: 2, scope: !4) !22 = !{double 1.000000e+00} -!23 = !{i32 3, i32 0, !17, null} -!24 = !{i32 4, i32 0, !25, null} +!23 = !MDLocation(line: 3, scope: !17) +!24 = !MDLocation(line: 4, scope: !25) !25 = !{!"0xb\003\000\001", !1, !17} ; [ DW_TAG_lexical_block ] [/Users/nadav/file.c] -!29 = !{i32 5, i32 0, !25, null} -!30 = !{i32 7, i32 0, !4, null} -!31 = !{i32 8, i32 0, !4, null} +!29 = !MDLocation(line: 5, scope: !25) +!30 = !MDLocation(line: 7, scope: !4) +!31 = !MDLocation(line: 8, scope: !4) !32 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/Transforms/SampleProfile/branch.ll b/llvm/test/Transforms/SampleProfile/branch.ll index 69a8967ee0b..6391fc5158c 100644 --- a/llvm/test/Transforms/SampleProfile/branch.ll +++ b/llvm/test/Transforms/SampleProfile/branch.ll @@ -125,19 +125,19 @@ attributes #4 = { nounwind readonly } !24 = !{!"0xb\0011\000\000", !1, !22} ; [ DW_TAG_lexical_block ] [./branch.cc] !25 = !{i32 2, !"Dwarf Version", i32 4} !26 = !{!"clang version 3.4 (trunk 192896) (llvm/trunk 192895)"} -!27 = !{i32 4, i32 0, !4, null} -!28 = !{i32 5, i32 0, !29, null} +!27 = !MDLocation(line: 4, scope: !4) +!28 = !MDLocation(line: 5, scope: !29) !29 = !{!"0xb\005\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [./branch.cc] -!30 = !{i32 8, i32 0, !4, null} +!30 = !MDLocation(line: 8, scope: !4) !31 = !{!32, !32, i64 0} !32 = !{!"any pointer", !33, i64 0} !33 = !{!"omnipotent char", !34, i64 0} !34 = !{!"Simple C/C++ TBAA"} -!35 = !{i32 9, i32 0, !20, null} -!36 = !{i32 13, i32 0, !24, null} -!37 = !{i32 14, i32 0, !24, null} -!38 = !{i32 11, i32 0, !22, null} -!39 = !{i32 20, i32 0, !4, null} -!40 = !{i32 21, i32 0, !4, null} -!41 = !{i32 22, i32 0, !4, null} +!35 = !MDLocation(line: 9, scope: !20) +!36 = !MDLocation(line: 13, scope: !24) +!37 = !MDLocation(line: 14, scope: !24) +!38 = !MDLocation(line: 11, scope: !22) +!39 = !MDLocation(line: 20, scope: !4) +!40 = !MDLocation(line: 21, scope: !4) +!41 = !MDLocation(line: 22, scope: !4) !42 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/Transforms/SampleProfile/calls.ll b/llvm/test/Transforms/SampleProfile/calls.ll index 7b2a2bf16bd..d56660937bc 100644 --- a/llvm/test/Transforms/SampleProfile/calls.ll +++ b/llvm/test/Transforms/SampleProfile/calls.ll @@ -103,18 +103,18 @@ declare i32 @printf(i8*, ...) #2 !8 = !{i32 2, !"Dwarf Version", i32 4} !9 = !{i32 1, !"Debug Info Version", i32 2} !10 = !{!"clang version 3.5 "} -!11 = !{i32 4, i32 0, !4, null} -!12 = !{i32 8, i32 0, !7, null} -!13 = !{i32 9, i32 0, !7, null} -!14 = !{i32 9, i32 0, !15, null} +!11 = !MDLocation(line: 4, scope: !4) +!12 = !MDLocation(line: 8, scope: !7) +!13 = !MDLocation(line: 9, scope: !7) +!14 = !MDLocation(line: 9, scope: !15) !15 = !{!"0xb\001", !1, !7} ; [ DW_TAG_lexical_block ] [./calls.cc] -!16 = !{i32 10, i32 0, !17, null} +!16 = !MDLocation(line: 10, scope: !17) !17 = !{!"0xb\0010\000\000", !1, !7} ; [ DW_TAG_lexical_block ] [./calls.cc] -!18 = !{i32 10, i32 0, !19, null} +!18 = !MDLocation(line: 10, scope: !19) !19 = !{!"0xb\001", !1, !17} ; [ DW_TAG_lexical_block ] [./calls.cc] -!20 = !{i32 10, i32 0, !21, null} +!20 = !MDLocation(line: 10, scope: !21) !21 = !{!"0xb\002", !1, !17} ; [ DW_TAG_lexical_block ] [./calls.cc] -!22 = !{i32 10, i32 0, !23, null} +!22 = !MDLocation(line: 10, scope: !23) !23 = !{!"0xb\003", !1, !17} ; [ DW_TAG_lexical_block ] [./calls.cc] -!24 = !{i32 11, i32 0, !7, null} -!25 = !{i32 12, i32 0, !7, null} +!24 = !MDLocation(line: 11, scope: !7) +!25 = !MDLocation(line: 12, scope: !7) diff --git a/llvm/test/Transforms/SampleProfile/discriminator.ll b/llvm/test/Transforms/SampleProfile/discriminator.ll index 9d7e003d91c..cafc69d1492 100644 --- a/llvm/test/Transforms/SampleProfile/discriminator.ll +++ b/llvm/test/Transforms/SampleProfile/discriminator.ll @@ -76,15 +76,15 @@ while.end: ; preds = %while.cond !7 = !{i32 2, !"Dwarf Version", i32 4} !8 = !{i32 1, !"Debug Info Version", i32 2} !9 = !{!"clang version 3.5 "} -!10 = !{i32 2, i32 0, !4, null} -!11 = !{i32 3, i32 0, !4, null} -!12 = !{i32 3, i32 0, !13, null} +!10 = !MDLocation(line: 2, scope: !4) +!11 = !MDLocation(line: 3, scope: !4) +!12 = !MDLocation(line: 3, scope: !13) !13 = !{!"0xb\001", !1, !4} ; [ DW_TAG_lexical_block ] [discriminator.c] -!14 = !{i32 4, i32 0, !15, null} +!14 = !MDLocation(line: 4, scope: !15) !15 = !{!"0xb\004\000\001", !1, !16} ; [ DW_TAG_lexical_block ] [discriminator.c] !16 = !{!"0xb\003\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [discriminator.c] -!17 = !{i32 4, i32 0, !18, null} +!17 = !MDLocation(line: 4, scope: !18) !18 = !{!"0xb\001", !1, !15} ; [ DW_TAG_lexical_block ] [discriminator.c] -!19 = !{i32 5, i32 0, !16, null} -!20 = !{i32 6, i32 0, !16, null} -!21 = !{i32 7, i32 0, !4, null} +!19 = !MDLocation(line: 5, scope: !16) +!20 = !MDLocation(line: 6, scope: !16) +!21 = !MDLocation(line: 7, scope: !4) diff --git a/llvm/test/Transforms/SampleProfile/fnptr.ll b/llvm/test/Transforms/SampleProfile/fnptr.ll index d86c5c3f7bf..096033bd35f 100644 --- a/llvm/test/Transforms/SampleProfile/fnptr.ll +++ b/llvm/test/Transforms/SampleProfile/fnptr.ll @@ -129,27 +129,27 @@ declare i32 @printf(i8* nocapture readonly, ...) #1 !0 = !{i32 2, !"Debug Info Version", i32 2} !1 = !{!"clang version 3.6.0 "} -!2 = !{i32 9, i32 3, !3, null} +!2 = !MDLocation(line: 9, column: 3, scope: !3) !3 = !{!"0x2e\00foo\00foo\00\008\000\001\000\000\00256\001\008", !4, !5, !6, null, double (i32)* @_Z3fooi, null, null, !7} ; [ DW_TAG_subprogram ] [line 8] [def] [foo] !4 = !{!"fnptr.cc", !"."} !5 = !{!"0x29", !4} ; [ DW_TAG_file_type ] [./fnptr.cc] !6 = !{!"0x15\00\000\000\000\000\000\000", null, null, null, !7, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ] !7 = !{} -!8 = !{i32 9, i32 14, !3, null} -!9 = !{i32 13, i32 3, !10, null} +!8 = !MDLocation(line: 9, column: 14, scope: !3) +!9 = !MDLocation(line: 13, column: 3, scope: !10) !10 = !{!"0x2e\00bar\00bar\00\0012\000\001\000\000\00256\001\0012", !4, !5, !6, null, double (i32)* @_Z3bari, null, null, !7} ; [ DW_TAG_subprogram ] [line 12] [def] [bar] -!11 = !{i32 13, i32 14, !10, null} -!12 = !{i32 19, i32 3, !13, null} +!11 = !MDLocation(line: 13, column: 14, scope: !10) +!12 = !MDLocation(line: 19, column: 3, scope: !13) !13 = !{!"0x2e\00main\00main\00\0016\000\001\000\000\00256\001\0016", !4, !5, !6, null, i32 ()* @main, null, null, !7} ; [ DW_TAG_subprogram ] [line 16] [def] [main] -!14 = !{i32 20, i32 5, !13, null} -!15 = !{i32 21, i32 15, !13, null} -!16 = !{i32 22, i32 11, !13, null} +!14 = !MDLocation(line: 20, column: 5, scope: !13) +!15 = !MDLocation(line: 21, column: 15, scope: !13) +!16 = !MDLocation(line: 22, column: 11, scope: !13) !17 = !{!"branch_weights", i32 534, i32 2064} -!18 = !{i32 23, i32 14, !13, null} -!19 = !{i32 25, i32 14, !13, null} -!20 = !{i32 20, i32 28, !13, null} +!18 = !MDLocation(line: 23, column: 14, scope: !13) +!19 = !MDLocation(line: 25, column: 14, scope: !13) +!20 = !MDLocation(line: 20, column: 28, scope: !13) !21 = !{!"branch_weights", i32 0, i32 1075} -!22 = !{i32 19, i32 26, !13, null} +!22 = !MDLocation(line: 19, column: 26, scope: !13) !23 = !{!"branch_weights", i32 0, i32 534} -!24 = !{i32 27, i32 3, !13, null} -!25 = !{i32 28, i32 3, !13, null} +!24 = !MDLocation(line: 27, column: 3, scope: !13) +!25 = !MDLocation(line: 28, column: 3, scope: !13) diff --git a/llvm/test/Transforms/SampleProfile/propagate.ll b/llvm/test/Transforms/SampleProfile/propagate.ll index 604f8b68355..594645f7f2b 100644 --- a/llvm/test/Transforms/SampleProfile/propagate.ll +++ b/llvm/test/Transforms/SampleProfile/propagate.ll @@ -209,35 +209,35 @@ attributes #2 = { "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "n !8 = !{i32 2, !"Dwarf Version", i32 4} !9 = !{i32 1, !"Debug Info Version", i32 2} !10 = !{!"clang version 3.5 "} -!11 = !{i32 4, i32 0, !12, null} +!11 = !MDLocation(line: 4, scope: !12) !12 = !{!"0xb\004\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [propagate.cc] -!13 = !{i32 5, i32 0, !14, null} +!13 = !MDLocation(line: 5, scope: !14) !14 = !{!"0xb\004\000\000", !1, !12} ; [ DW_TAG_lexical_block ] [propagate.cc] -!15 = !{i32 7, i32 0, !16, null} +!15 = !MDLocation(line: 7, scope: !16) !16 = !{!"0xb\007\000\000", !1, !17} ; [ DW_TAG_lexical_block ] [propagate.cc] !17 = !{!"0xb\006\000\000", !1, !12} ; [ DW_TAG_lexical_block ] [propagate.cc] -!18 = !{i32 8, i32 0, !19, null} +!18 = !MDLocation(line: 8, scope: !19) !19 = !{!"0xb\008\000\000", !1, !20} ; [ DW_TAG_lexical_block ] [propagate.cc] !20 = !{!"0xb\007\000\000", !1, !16} ; [ DW_TAG_lexical_block ] [propagate.cc] -!21 = !{i32 9, i32 0, !19, null} -!22 = !{i32 10, i32 0, !23, null} +!21 = !MDLocation(line: 9, scope: !19) +!22 = !MDLocation(line: 10, scope: !23) !23 = !{!"0xb\0010\000\000", !1, !20} ; [ DW_TAG_lexical_block ] [propagate.cc] -!24 = !{i32 11, i32 0, !25, null} +!24 = !MDLocation(line: 11, scope: !25) !25 = !{!"0xb\0010\000\000", !1, !23} ; [ DW_TAG_lexical_block ] [propagate.cc] -!26 = !{i32 12, i32 0, !25, null} -!27 = !{i32 13, i32 0, !25, null} -!28 = !{i32 14, i32 0, !29, null} +!26 = !MDLocation(line: 12, scope: !25) +!27 = !MDLocation(line: 13, scope: !25) +!28 = !MDLocation(line: 14, scope: !29) !29 = !{!"0xb\0014\000\000", !1, !30} ; [ DW_TAG_lexical_block ] [propagate.cc] !30 = !{!"0xb\0013\000\000", !1, !23} ; [ DW_TAG_lexical_block ] [propagate.cc] -!31 = !{i32 15, i32 0, !32, null} +!31 = !MDLocation(line: 15, scope: !32) !32 = !{!"0xb\0014\000\000", !1, !29} ; [ DW_TAG_lexical_block ] [propagate.cc] -!33 = !{i32 16, i32 0, !32, null} -!34 = !{i32 17, i32 0, !32, null} -!35 = !{i32 19, i32 0, !20, null} -!36 = !{i32 21, i32 0, !4, null} -!37 = !{i32 22, i32 0, !4, null} -!38 = !{i32 25, i32 0, !7, null} -!39 = !{i32 26, i32 0, !7, null} -!40 = !{i32 27, i32 0, !7, null} -!41 = !{i32 28, i32 0, !7, null} -!42 = !{i32 29, i32 0, !7, null} +!33 = !MDLocation(line: 16, scope: !32) +!34 = !MDLocation(line: 17, scope: !32) +!35 = !MDLocation(line: 19, scope: !20) +!36 = !MDLocation(line: 21, scope: !4) +!37 = !MDLocation(line: 22, scope: !4) +!38 = !MDLocation(line: 25, scope: !7) +!39 = !MDLocation(line: 26, scope: !7) +!40 = !MDLocation(line: 27, scope: !7) +!41 = !MDLocation(line: 28, scope: !7) +!42 = !MDLocation(line: 29, scope: !7) diff --git a/llvm/test/Transforms/ScalarRepl/debuginfo-preserved.ll b/llvm/test/Transforms/ScalarRepl/debuginfo-preserved.ll index 9514f2e9759..b0c459e21b1 100644 --- a/llvm/test/Transforms/ScalarRepl/debuginfo-preserved.ll +++ b/llvm/test/Transforms/ScalarRepl/debuginfo-preserved.ll @@ -49,16 +49,16 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !4 = !{!5} !5 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !0} ; [ DW_TAG_base_type ] !6 = !{!"0x101\00a\0016777217\000", !1, !2, !5} ; [ DW_TAG_arg_variable ] -!7 = !{i32 1, i32 11, !1, null} +!7 = !MDLocation(line: 1, column: 11, scope: !1) !8 = !{!"0x101\00b\0033554433\000", !1, !2, !5} ; [ DW_TAG_arg_variable ] -!9 = !{i32 1, i32 18, !1, null} +!9 = !MDLocation(line: 1, column: 18, scope: !1) !10 = !{!"0x100\00c\002\000", !11, !2, !5} ; [ DW_TAG_auto_variable ] !11 = !{!"0xb\001\0021\000", !18, !1} ; [ DW_TAG_lexical_block ] -!12 = !{i32 2, i32 9, !11, null} -!13 = !{i32 2, i32 14, !11, null} -!14 = !{i32 3, i32 5, !11, null} -!15 = !{i32 4, i32 5, !11, null} -!16 = !{i32 5, i32 5, !11, null} +!12 = !MDLocation(line: 2, column: 9, scope: !11) +!13 = !MDLocation(line: 2, column: 14, scope: !11) +!14 = !MDLocation(line: 3, column: 5, scope: !11) +!15 = !MDLocation(line: 4, column: 5, scope: !11) +!16 = !MDLocation(line: 5, column: 5, scope: !11) !17 = !{!1} !18 = !{!"/d/j/debug-test.c", !"/Volumes/Data/b"} !19 = !{i32 0} diff --git a/llvm/test/Transforms/Scalarizer/dbginfo.ll b/llvm/test/Transforms/Scalarizer/dbginfo.ll index 4dab7dcab1c..ed65aaace2c 100644 --- a/llvm/test/Transforms/Scalarizer/dbginfo.ll +++ b/llvm/test/Transforms/Scalarizer/dbginfo.ll @@ -77,10 +77,10 @@ attributes #1 = { nounwind readnone } !17 = !{!"0x101\00c\0050331651\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [c] [line 3] !18 = !{i32 2, !"Dwarf Version", i32 4} !19 = !{!"clang version 3.4 (trunk 194134) (llvm/trunk 194126)"} -!20 = !{i32 3, i32 0, !4, null} -!21 = !{i32 5, i32 0, !4, null} +!20 = !MDLocation(line: 3, scope: !4) +!21 = !MDLocation(line: 5, scope: !4) !22 = !{!23, !23, i64 0} !23 = !{!"omnipotent char", !24, i64 0} !24 = !{!"Simple C/C++ TBAA"} -!25 = !{i32 6, i32 0, !4, null} +!25 = !MDLocation(line: 6, scope: !4) !26 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/Transforms/SimplifyCFG/branch-fold-dbg.ll b/llvm/test/Transforms/SimplifyCFG/branch-fold-dbg.ll index bc0af6430ed..f715a0cda93 100644 --- a/llvm/test/Transforms/SimplifyCFG/branch-fold-dbg.ll +++ b/llvm/test/Transforms/SimplifyCFG/branch-fold-dbg.ll @@ -46,14 +46,14 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !2 = !{!"0x11\0012\00clang (trunk 129006)\001\00\000\00\000", !15, !4, !4, null, null, null} ; [ DW_TAG_compile_unit ] !3 = !{!"0x15\00\000\000\000\000\000\000", !15, !1, null, !4, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ] !4 = !{null} -!5 = !{i32 131, i32 2, !0, null} -!6 = !{i32 134, i32 2, !0, null} +!5 = !MDLocation(line: 131, column: 2, scope: !0) +!6 = !MDLocation(line: 134, column: 2, scope: !0) !7 = !{!"0x100\00bar\00232\000", !8, !1, !9} ; [ DW_TAG_auto_variable ] !8 = !{!"0xb\00231\001\003", !15, !0} ; [ DW_TAG_lexical_block ] !9 = !{!"0xf\00\000\0032\0032\000\000", null, !2, !10} ; [ DW_TAG_pointer_type ] !10 = !{!"0x26\00\000\000\000\000\000", null, !2, !11} ; [ DW_TAG_const_type ] !11 = !{!"0x24\00unsigned int\000\0032\0032\000\000\007", null, !2} ; [ DW_TAG_base_type ] -!12 = !{i32 232, i32 40, !8, null} -!13 = !{i32 234, i32 2, !8, null} -!14 = !{i32 274, i32 1, !8, null} +!12 = !MDLocation(line: 232, column: 40, scope: !8) +!13 = !MDLocation(line: 234, column: 2, scope: !8) +!14 = !MDLocation(line: 274, column: 1, scope: !8) !15 = !{!"a.c", !"/private/tmp"} diff --git a/llvm/test/Transforms/SimplifyCFG/hoist-dbgvalue.ll b/llvm/test/Transforms/SimplifyCFG/hoist-dbgvalue.ll index 05e0eee0c7e..869ce099d07 100644 --- a/llvm/test/Transforms/SimplifyCFG/hoist-dbgvalue.ll +++ b/llvm/test/Transforms/SimplifyCFG/hoist-dbgvalue.ll @@ -39,18 +39,18 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !4 = !{!5} !5 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !2} ; [ DW_TAG_base_type ] !6 = !{!"0x101\00i\0016777218\000", !0, !1, !5} ; [ DW_TAG_arg_variable ] -!7 = !{i32 2, i32 13, !0, null} +!7 = !MDLocation(line: 2, column: 13, scope: !0) !8 = !{i32 0} !9 = !{!"0x100\00k\003\000", !10, !1, !5} ; [ DW_TAG_auto_variable ] !10 = !{!"0xb\002\0016\000", !20, !0} ; [ DW_TAG_lexical_block ] -!11 = !{i32 3, i32 12, !10, null} -!12 = !{i32 4, i32 3, !10, null} -!13 = !{i32 5, i32 5, !14, null} +!11 = !MDLocation(line: 3, column: 12, scope: !10) +!12 = !MDLocation(line: 4, column: 3, scope: !10) +!13 = !MDLocation(line: 5, column: 5, scope: !14) !14 = !{!"0xb\004\0010\001", !20, !10} ; [ DW_TAG_lexical_block ] -!15 = !{i32 6, i32 3, !14, null} -!16 = !{i32 7, i32 5, !17, null} +!15 = !MDLocation(line: 6, column: 3, scope: !14) +!16 = !MDLocation(line: 7, column: 5, scope: !17) !17 = !{!"0xb\006\0010\002", !20, !10} ; [ DW_TAG_lexical_block ] -!18 = !{i32 8, i32 3, !17, null} -!19 = !{i32 9, i32 3, !10, null} +!18 = !MDLocation(line: 8, column: 3, scope: !17) +!19 = !MDLocation(line: 9, column: 3, scope: !10) !20 = !{!"b.c", !"/private/tmp"} !21 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/Transforms/SimplifyCFG/trap-debugloc.ll b/llvm/test/Transforms/SimplifyCFG/trap-debugloc.ll index 2a552559965..24a286fd973 100644 --- a/llvm/test/Transforms/SimplifyCFG/trap-debugloc.ll +++ b/llvm/test/Transforms/SimplifyCFG/trap-debugloc.ll @@ -16,9 +16,9 @@ define void @foo() nounwind ssp { !2 = !{!"0x11\0012\00Apple clang version 3.0 (tags/Apple/clang-206.1) (based on LLVM 3.0svn)\001\00\000\00\000", !8, !4, !4, !9, null, null} ; [ DW_TAG_compile_unit ] !3 = !{!"0x15\00\000\000\000\000\000\000", !8, !1, null, !4, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ] !4 = !{null} -!5 = !{i32 4, i32 2, !6, null} +!5 = !MDLocation(line: 4, column: 2, scope: !6) !6 = !{!"0xb\003\0012\000", !8, !0} ; [ DW_TAG_lexical_block ] -!7 = !{i32 5, i32 1, !6, null} +!7 = !MDLocation(line: 5, column: 1, scope: !6) !8 = !{!"foo.c", !"/private/tmp"} !9 = !{!0} !10 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/Transforms/StripSymbols/2010-06-30-StripDebug.ll b/llvm/test/Transforms/StripSymbols/2010-06-30-StripDebug.ll index 5944d97e575..f2c705a317a 100644 --- a/llvm/test/Transforms/StripSymbols/2010-06-30-StripDebug.ll +++ b/llvm/test/Transforms/StripSymbols/2010-06-30-StripDebug.ll @@ -28,7 +28,7 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !7 = !{!"0x24\00int\000\0032\0032\000\000\005", !12, !1} ; [ DW_TAG_base_type ] !8 = !{!"0x34\00x\00x\00\001\000\001", !1, !1, !7, i32* @x} ; [ DW_TAG_variable ] !9 = !{i32 0} -!10 = !{i32 3, i32 0, !6, null} -!11 = !{i32 4, i32 0, !6, null} +!10 = !MDLocation(line: 3, scope: !6) +!11 = !MDLocation(line: 4, scope: !6) !12 = !{!"b.c", !"/tmp"} !13 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/Transforms/StripSymbols/2010-08-25-crash.ll b/llvm/test/Transforms/StripSymbols/2010-08-25-crash.ll index f7840b43190..1534647c2a7 100644 --- a/llvm/test/Transforms/StripSymbols/2010-08-25-crash.ll +++ b/llvm/test/Transforms/StripSymbols/2010-08-25-crash.ll @@ -15,7 +15,7 @@ entry: !5 = !{!"0x24\00int\000\0032\0032\000\000\005", !10, !1} ; [ DW_TAG_base_type ] !6 = !{!"0x34\00i\00i\00i\002\001\001", !1, !1, !7, i32 0, null} ; [ DW_TAG_variable ] !7 = !{!"0x26\00\000\000\000\000\000", !10, !1, !5} ; [ DW_TAG_const_type ] -!8 = !{i32 3, i32 13, !9, null} +!8 = !MDLocation(line: 3, column: 13, scope: !9) !9 = !{!"0xb\003\0011\000", !10, !0} ; [ DW_TAG_lexical_block ] !10 = !{!"/tmp/a.c", !"/Volumes/Lalgate/clean/D.CW"} !11 = !{i32 0} diff --git a/llvm/test/Transforms/StripSymbols/strip-dead-debug-info.ll b/llvm/test/Transforms/StripSymbols/strip-dead-debug-info.ll index 716880c2c2f..aca7cd60847 100644 --- a/llvm/test/Transforms/StripSymbols/strip-dead-debug-info.ll +++ b/llvm/test/Transforms/StripSymbols/strip-dead-debug-info.ll @@ -48,10 +48,10 @@ attributes #2 = { nounwind readonly ssp } !15 = !{!"0x101\00i\007\000", !10, !5, !9} ; [ DW_TAG_arg_variable ] !16 = !{!"0x34\00abcd\00abcd\00\002\001\001", !5, !5, !9, null, null} ; [ DW_TAG_variable ] !17 = !{!"0x34\00xyz\00xyz\00\003\000\001", !5, !5, !9, i32* @xyz, null} ; [ DW_TAG_variable ] -!18 = !{i32 6, i32 0, !19, null} +!18 = !MDLocation(line: 6, scope: !19) !19 = !{!"0xb\006\000\000", !1, !6} ; [ DW_TAG_lexical_block ] [/tmp//g.c] -!20 = !{i32 7, i32 0, !10, null} -!21 = !{i32 10, i32 0, !22, null} +!20 = !MDLocation(line: 7, scope: !10) +!21 = !MDLocation(line: 10, scope: !22) !22 = !{!"0xb\007\000\000", !1, !10} ; [ DW_TAG_lexical_block ] [/tmp//g.c] !23 = !{!3, !6, !10} !24 = !{!16, !17} |
