diff options
Diffstat (limited to 'llvm/test/CodeGen')
43 files changed, 290 insertions, 290 deletions
diff --git a/llvm/test/CodeGen/AArch64/aarch64-2014-08-11-MachineCombinerCrash.ll b/llvm/test/CodeGen/AArch64/aarch64-2014-08-11-MachineCombinerCrash.ll index a9b1986971f..73ee522cbf5 100644 --- a/llvm/test/CodeGen/AArch64/aarch64-2014-08-11-MachineCombinerCrash.ll +++ b/llvm/test/CodeGen/AArch64/aarch64-2014-08-11-MachineCombinerCrash.ll @@ -83,24 +83,24 @@ attributes #1 = { nounwind readnone } !36 = !{i32 2, !"Dwarf Version", i32 4} !37 = !{i32 2, !"Debug Info Version", i32 2} !38 = !{!"clang version 3.6.0 "} -!39 = !{i32 154, i32 8, !40, null} +!39 = !MDLocation(line: 154, column: 8, scope: !40) !40 = !{!"0xb\00154\008\002", !1, !41} ; [ DW_TAG_lexical_block ] [ ] [] !41 = !{!"0xb\00154\008\001", !1, !42} ; [ DW_TAG_lexical_block ] [ ] [] !42 = !{!"0xb\00154\003\000", !1, !4} ; [ DW_TAG_lexical_block ] [ ] [] -!43 = !{i32 157, i32 5, !44, null} +!43 = !MDLocation(line: 157, column: 5, scope: !44) !44 = !{!"0xb\00154\0042\000", !1, !42} ; [ DW_TAG_lexical_block ] [ ] [] -!45 = !{i32 159, i32 5, !44, null} +!45 = !MDLocation(line: 159, column: 5, scope: !44) !46 = !{!47, !47, i64 0} !47 = !{!"int", !48, i64 0} !48 = !{!"omnipotent char", !49, i64 0} !49 = !{!"Simple C/C++ TBAA"} -!50 = !{i32 160, i32 5, !44, null} -!51 = !{i32 161, i32 5, !44, null} -!52 = !{i32 188, i32 5, !44, null} -!53 = !{i32 190, i32 5, !44, null} -!54 = !{i32 198, i32 5, !44, null} -!55 = !{i32 144, i32 13, !4, null} -!56 = !{i32 200, i32 5, !44, null} -!57 = !{i32 203, i32 5, !44, null} -!58 = !{i32 207, i32 5, !44, null} -!59 = !{i32 208, i32 5, !44, null} +!50 = !MDLocation(line: 160, column: 5, scope: !44) +!51 = !MDLocation(line: 161, column: 5, scope: !44) +!52 = !MDLocation(line: 188, column: 5, scope: !44) +!53 = !MDLocation(line: 190, column: 5, scope: !44) +!54 = !MDLocation(line: 198, column: 5, scope: !44) +!55 = !MDLocation(line: 144, column: 13, scope: !4) +!56 = !MDLocation(line: 200, column: 5, scope: !44) +!57 = !MDLocation(line: 203, column: 5, scope: !44) +!58 = !MDLocation(line: 207, column: 5, scope: !44) +!59 = !MDLocation(line: 208, column: 5, scope: !44) diff --git a/llvm/test/CodeGen/AArch64/arm64-2011-03-17-AsmPrinterCrash.ll b/llvm/test/CodeGen/AArch64/arm64-2011-03-17-AsmPrinterCrash.ll index 9644ba0d586..8b88c0b4088 100644 --- a/llvm/test/CodeGen/AArch64/arm64-2011-03-17-AsmPrinterCrash.ll +++ b/llvm/test/CodeGen/AArch64/arm64-2011-03-17-AsmPrinterCrash.ll @@ -34,12 +34,12 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !10 = !{!"0x2e\00print_double\00print_double\00\00203\001\001\000\006\00256\000\000", !20, !2, !4, null, null, null, null, null} ; [ DW_TAG_subprogram ] !11 = !{!"0x2e\00print_number\00print_number\00\0075\001\001\000\006\00256\000\000", !20, !2, !4, i32 0, null, null, null, null} ; [ DW_TAG_subprogram ] !12 = !{!"0x2e\00get_flags\00get_flags\00\00508\001\001\000\006\00256\000\000", !20, !2, !8, null, null, null, null, null} ; [ DW_TAG_subprogram ] -!13 = !{i32 653, i32 5, !14, null} +!13 = !MDLocation(line: 653, column: 5, scope: !14) !14 = !{!"0xb\00652\0035\002", !20, !15} ; [ DW_TAG_lexical_block ] !15 = !{!"0xb\00616\001\000", !20, !1} ; [ DW_TAG_lexical_block ] !16 = !{!"0x100\00do_tab_convert\00853\000", !17, !2, !6} ; [ DW_TAG_auto_variable ] !17 = !{!"0xb\00850\0012\0033", !20, !14} ; [ DW_TAG_lexical_block ] -!18 = !{i32 853, i32 11, !17, null} -!19 = !{i32 853, i32 29, !17, null} +!18 = !MDLocation(line: 853, column: 11, scope: !17) +!19 = !MDLocation(line: 853, column: 29, scope: !17) !20 = !{!"print.i", !"/Volumes/Ebi/echeng/radars/r9146594"} !21 = !{i32 0} diff --git a/llvm/test/CodeGen/ARM/2009-10-16-Scope.ll b/llvm/test/CodeGen/ARM/2009-10-16-Scope.ll index 288bb05d38b..de05644fc90 100644 --- a/llvm/test/CodeGen/ARM/2009-10-16-Scope.ll +++ b/llvm/test/CodeGen/ARM/2009-10-16-Scope.ll @@ -22,13 +22,13 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone declare i32 @foo(i32) ssp -!0 = !{i32 5, i32 2, !1, null} +!0 = !MDLocation(line: 5, column: 2, scope: !1) !1 = !{!"0xb\001\001\000", null, !2}; [DW_TAG_lexical_block ] !2 = !{!"0x2e\00bar\00bar\00bar\004\000\001\000\006\000\000\000", i32 0, !3, null, null, null, null, null, null}; [DW_TAG_subprogram ] !3 = !{!"0x11\0012\00clang 1.1\001\00\000\00\000", !8, null, !9, null, null, null}; [DW_TAG_compile_unit ] !4 = !{!"0x100\00count_\005\000", !5, !3, !6}; [ DW_TAG_auto_variable ] !5 = !{!"0xb\001\001\000", null, !1}; [DW_TAG_lexical_block ] !6 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !3}; [DW_TAG_base_type ] -!7 = !{i32 6, i32 1, !2, null} +!7 = !MDLocation(line: 6, column: 1, scope: !2) !8 = !{!"genmodes.i", !"/Users/yash/Downloads"} !9 = !{i32 0} diff --git a/llvm/test/CodeGen/ARM/2010-04-15-ScavengerDebugValue.ll b/llvm/test/CodeGen/ARM/2010-04-15-ScavengerDebugValue.ll index 846d4c56f7d..6f7db935218 100644 --- a/llvm/test/CodeGen/ARM/2010-04-15-ScavengerDebugValue.ll +++ b/llvm/test/CodeGen/ARM/2010-04-15-ScavengerDebugValue.ll @@ -24,9 +24,9 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !6 = !{!"0x16\00SItype\00152\000\000\000\000", !12, null, !8} ; [ DW_TAG_typedef ] !7 = !{!"0x29", !"libgcc2.h", !"/Users/bwilson/local/nightly/test-2010-04-14/build/llvmgcc.roots/llvmgcc~obj/src/gcc", !3} ; [ DW_TAG_file_type ] !8 = !{!"0x24\00int\000\0032\0032\000\000\005", !12, !2} ; [ DW_TAG_base_type ] -!9 = !{i32 95, i32 0, !10, null} +!9 = !MDLocation(line: 95, scope: !10) !10 = !{!"0xb\0094\000\000", !12, !1} ; [ DW_TAG_lexical_block ] -!11 = !{i32 100, i32 0, !10, null} +!11 = !MDLocation(line: 100, scope: !10) !13 = !{i32 0} !14 = !{!1} !15 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/CodeGen/ARM/2010-06-25-Thumb2ITInvalidIterator.ll b/llvm/test/CodeGen/ARM/2010-06-25-Thumb2ITInvalidIterator.ll index 2f6a6602dae..18b3be0aba5 100644 --- a/llvm/test/CodeGen/ARM/2010-06-25-Thumb2ITInvalidIterator.ll +++ b/llvm/test/CodeGen/ARM/2010-06-25-Thumb2ITInvalidIterator.ll @@ -62,15 +62,15 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !12 = !{!"0x100\00c\007\000", !11, !2, !13} ; [ DW_TAG_auto_variable ] !13 = !{!"0x24\00int\000\0032\0032\000\000\005", !26, !2} ; [ DW_TAG_base_type ] !14 = !{!"0x34\00length\00length\00length\001\000\001", !2, !2, !13, i32* @length} ; [ DW_TAG_variable ] -!15 = !{i32 4, i32 24, !1, null} -!16 = !{i32 4, i32 43, !1, null} -!17 = !{i32 9, i32 2, !11, null} +!15 = !MDLocation(line: 4, column: 24, scope: !1) +!16 = !MDLocation(line: 4, column: 43, scope: !1) +!17 = !MDLocation(line: 9, column: 2, scope: !11) !18 = !{i32 0} -!19 = !{i32 10, i32 2, !11, null} -!20 = !{i32 11, i32 2, !11, null} -!21 = !{i32 12, i32 3, !22, null} +!19 = !MDLocation(line: 10, column: 2, scope: !11) +!20 = !MDLocation(line: 11, column: 2, scope: !11) +!21 = !MDLocation(line: 12, column: 3, scope: !22) !22 = !{!"0xb\0011\0045\000", !26, !11} ; [ DW_TAG_lexical_block ] -!23 = !{i32 13, i32 3, !22, null} -!24 = !{i32 14, i32 2, !22, null} -!25 = !{i32 15, i32 1, !11, null} +!23 = !MDLocation(line: 13, column: 3, scope: !22) +!24 = !MDLocation(line: 14, column: 2, scope: !22) +!25 = !MDLocation(line: 15, column: 1, scope: !11) !26 = !{!"t.c", !"/private/tmp"} diff --git a/llvm/test/CodeGen/ARM/2010-08-04-StackVariable.ll b/llvm/test/CodeGen/ARM/2010-08-04-StackVariable.ll index 9de31d87fff..f71a6c9732a 100644 --- a/llvm/test/CodeGen/ARM/2010-08-04-StackVariable.ll +++ b/llvm/test/CodeGen/ARM/2010-08-04-StackVariable.ll @@ -101,28 +101,28 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !21 = !{!"0x15\00\000\000\000\000\000\000", !48, null, null, !22, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ] !22 = !{!13} !23 = !{!"0x101\00i\0016\000", !17, !2, !13} ; [ DW_TAG_arg_variable ] -!24 = !{i32 16, i32 0, !17, null} +!24 = !MDLocation(line: 16, scope: !17) !25 = !{!"0x101\00location\0016\000", !17, !2, !26} ; [ DW_TAG_arg_variable ] !26 = !{!"0x10\00SVal\000\0064\0064\000\000", !48, !2, !1} ; [ DW_TAG_reference_type ] -!27 = !{i32 17, i32 0, !28, null} +!27 = !MDLocation(line: 17, scope: !28) !28 = !{!"0xb\0016\000\002", !2, !17} ; [ DW_TAG_lexical_block ] -!29 = !{i32 18, i32 0, !28, null} -!30 = !{i32 20, i32 0, !28, null} +!29 = !MDLocation(line: 18, scope: !28) +!30 = !MDLocation(line: 20, scope: !28) !31 = !{!"0x101\00this\0011\000", !16, !2, !32} ; [ DW_TAG_arg_variable ] !32 = !{!"0x26\00\000\0064\0064\000\0064", !48, !2, !33} ; [ DW_TAG_const_type ] !33 = !{!"0xf\00\000\0064\0064\000\000", !48, !2, !1} ; [ DW_TAG_pointer_type ] -!34 = !{i32 11, i32 0, !16, null} -!35 = !{i32 11, i32 0, !36, null} +!34 = !MDLocation(line: 11, scope: !16) +!35 = !MDLocation(line: 11, scope: !36) !36 = !{!"0xb\0011\000\001", !48, !37} ; [ DW_TAG_lexical_block ] !37 = !{!"0xb\0011\000\000", !48, !16} ; [ DW_TAG_lexical_block ] !38 = !{!"0x100\00v\0024\000", !39, !2, !1} ; [ DW_TAG_auto_variable ] !39 = !{!"0xb\0023\000\004", !48, !40} ; [ DW_TAG_lexical_block ] !40 = !{!"0xb\0023\000\003", !48, !20} ; [ DW_TAG_lexical_block ] -!41 = !{i32 24, i32 0, !39, null} -!42 = !{i32 25, i32 0, !39, null} -!43 = !{i32 26, i32 0, !39, null} +!41 = !MDLocation(line: 24, scope: !39) +!42 = !MDLocation(line: 25, scope: !39) +!43 = !MDLocation(line: 26, scope: !39) !44 = !{!"0x100\00k\0026\000", !39, !2, !13} ; [ DW_TAG_auto_variable ] -!45 = !{i32 27, i32 0, !39, null} +!45 = !MDLocation(line: 27, scope: !39) !46 = !{!16, !17, !20} !47 = !{} !48 = !{!"small.cc", !"/Users/manav/R8248330"} diff --git a/llvm/test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll b/llvm/test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll index 569fcc4d210..67dda672719 100644 --- a/llvm/test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll +++ b/llvm/test/CodeGen/ARM/2011-01-19-MergedGlobalDbg.ll @@ -108,16 +108,16 @@ entry: !27 = !{!"0x101\00a\0016\000", !9, !1, !5} ; [ DW_TAG_arg_variable ] !28 = !{!"0x100\00b\0016\000", !29, !1, !5} ; [ DW_TAG_auto_variable ] !29 = !{!"0xb\0016\000\004", !47, !9} ; [ DW_TAG_lexical_block ] -!30 = !{i32 4, i32 0, !0, null} -!31 = !{i32 4, i32 0, !12, null} -!32 = !{i32 7, i32 0, !6, null} -!33 = !{i32 7, i32 0, !20, null} -!34 = !{i32 10, i32 0, !7, null} -!35 = !{i32 10, i32 0, !23, null} -!36 = !{i32 13, i32 0, !8, null} -!37 = !{i32 13, i32 0, !26, null} -!38 = !{i32 16, i32 0, !9, null} -!39 = !{i32 16, i32 0, !29, null} +!30 = !MDLocation(line: 4, scope: !0) +!31 = !MDLocation(line: 4, scope: !12) +!32 = !MDLocation(line: 7, scope: !6) +!33 = !MDLocation(line: 7, scope: !20) +!34 = !MDLocation(line: 10, scope: !7) +!35 = !MDLocation(line: 10, scope: !23) +!36 = !MDLocation(line: 13, scope: !8) +!37 = !MDLocation(line: 13, scope: !26) +!38 = !MDLocation(line: 16, scope: !9) +!39 = !MDLocation(line: 16, scope: !29) !40 = !{!0, !6, !7, !8, !9} !41 = !{!13, !14, !15, !16, !17} !42 = !{!10, !11} diff --git a/llvm/test/CodeGen/ARM/2011-08-02-MergedGlobalDbg.ll b/llvm/test/CodeGen/ARM/2011-08-02-MergedGlobalDbg.ll index 18d866c5373..3edc946825b 100644 --- a/llvm/test/CodeGen/ARM/2011-08-02-MergedGlobalDbg.ll +++ b/llvm/test/CodeGen/ARM/2011-08-02-MergedGlobalDbg.ll @@ -100,16 +100,16 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !27 = !{!"0x101\00a\0016777233\000", !9, !2, !5} ; [ DW_TAG_arg_variable ] !28 = !{!"0x100\00b\0017\000", !29, !2, !5} ; [ DW_TAG_auto_variable ] !29 = !{!"0xb\0017\0019\004", !47, !9} ; [ DW_TAG_lexical_block ] -!30 = !{i32 5, i32 16, !1, null} -!31 = !{i32 5, i32 32, !12, null} -!32 = !{i32 8, i32 14, !6, null} -!33 = !{i32 8, i32 29, !15, null} -!34 = !{i32 11, i32 16, !7, null} -!35 = !{i32 11, i32 32, !18, null} -!36 = !{i32 14, i32 16, !8, null} -!37 = !{i32 14, i32 32, !21, null} -!38 = !{i32 17, i32 16, !9, null} -!39 = !{i32 17, i32 32, !29, null} +!30 = !MDLocation(line: 5, column: 16, scope: !1) +!31 = !MDLocation(line: 5, column: 32, scope: !12) +!32 = !MDLocation(line: 8, column: 14, scope: !6) +!33 = !MDLocation(line: 8, column: 29, scope: !15) +!34 = !MDLocation(line: 11, column: 16, scope: !7) +!35 = !MDLocation(line: 11, column: 32, scope: !18) +!36 = !MDLocation(line: 14, column: 16, scope: !8) +!37 = !MDLocation(line: 14, column: 32, scope: !21) +!38 = !MDLocation(line: 17, column: 16, scope: !9) +!39 = !MDLocation(line: 17, column: 32, scope: !29) !40 = !{!1, !6, !7, !8, !9} !41 = !{!25, !26} !42 = !{!10, !11} diff --git a/llvm/test/CodeGen/ARM/coalesce-dbgvalue.ll b/llvm/test/CodeGen/ARM/coalesce-dbgvalue.ll index ff8804b405f..4e5fb5e5c60 100644 --- a/llvm/test/CodeGen/ARM/coalesce-dbgvalue.ll +++ b/llvm/test/CodeGen/ARM/coalesce-dbgvalue.ll @@ -100,12 +100,12 @@ attributes #3 = { nounwind } !18 = !{!"0x34\00b\00b\00\002\000\001", null, !5, !8, i32* @b, null} ; [ DW_TAG_variable ] [b] [line 2] [def] !19 = !{!"0x34\00c\00c\00\003\000\001", null, !5, !8, i32* @c, null} ; [ DW_TAG_variable ] [c] [line 3] [def] !20 = !{!"0x34\00d\00d\00\004\000\001", null, !5, !8, i32* @d, null} ; [ DW_TAG_variable ] [d] [line 4] [def] -!21 = !{i32 10, i32 0, !22, null} +!21 = !MDLocation(line: 10, scope: !22) !22 = !{!"0xb\0010\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [/d/b/pr16110.c] -!26 = !{i32 12, i32 0, !13, null} +!26 = !MDLocation(line: 12, scope: !13) !27 = !{i32* null} -!28 = !{i32 13, i32 0, !12, null} -!29 = !{i32 14, i32 0, !12, null} -!31 = !{i32 16, i32 0, !4, null} -!32 = !{i32 18, i32 0, !4, null} +!28 = !MDLocation(line: 13, scope: !12) +!29 = !MDLocation(line: 14, scope: !12) +!31 = !MDLocation(line: 16, scope: !4) +!32 = !MDLocation(line: 18, scope: !4) !33 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/CodeGen/ARM/debug-frame-vararg.ll b/llvm/test/CodeGen/ARM/debug-frame-vararg.ll index 1f04de29c53..05521d80646 100644 --- a/llvm/test/CodeGen/ARM/debug-frame-vararg.ll +++ b/llvm/test/CodeGen/ARM/debug-frame-vararg.ll @@ -38,7 +38,7 @@ !10 = !{i32 1, !"Debug Info Version", i32 2} !11 = !{!"clang version 3.5 "} !12 = !{!"0x101\00count\0016777221\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [count] [line 5] -!13 = !{i32 5, i32 0, !4, null} +!13 = !MDLocation(line: 5, scope: !4) !14 = !{!"0x100\00vl\006\000", !4, !5, !15} ; [ DW_TAG_auto_variable ] [vl] [line 6] !15 = !{!"0x16\00va_list\0030\000\000\000\000", !16, null, !17} ; [ DW_TAG_typedef ] [va_list] [line 30, size 0, align 0, offset 0] [from __builtin_va_list] !16 = !{!"/linux-x86_64-high/gcc_4.7.2/dbg/llvm/bin/../lib/clang/3.5/include/stdarg.h", !"/tmp"} @@ -47,18 +47,18 @@ !19 = !{!20} !20 = !{!"0xd\00__ap\006\0032\0032\000\000", !1, !18, !21} ; [ DW_TAG_member ] [__ap] [line 6, size 32, align 32, offset 0] [from ] !21 = !{!"0xf\00\000\0032\0032\000\000", null, null, null} ; [ DW_TAG_pointer_type ] [line 0, size 32, align 32, offset 0] [from ] -!22 = !{i32 6, i32 0, !4, null} -!23 = !{i32 7, i32 0, !4, null} +!22 = !MDLocation(line: 6, scope: !4) +!23 = !MDLocation(line: 7, scope: !4) !24 = !{!"0x100\00sum\008\000", !4, !5, !8} ; [ DW_TAG_auto_variable ] [sum] [line 8] -!25 = !{i32 8, i32 0, !4, null} +!25 = !MDLocation(line: 8, scope: !4) !26 = !{!"0x100\00i\009\000", !27, !5, !8} ; [ DW_TAG_auto_variable ] [i] [line 9] !27 = !{!"0xb\009\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [/tmp/var.c] -!28 = !{i32 9, i32 0, !27, null} -!29 = !{i32 10, i32 0, !30, null} +!28 = !MDLocation(line: 9, scope: !27) +!29 = !MDLocation(line: 10, scope: !30) !30 = !{!"0xb\009\000\001", !1, !27} ; [ DW_TAG_lexical_block ] [/tmp/var.c] -!31 = !{i32 11, i32 0, !30, null} -!32 = !{i32 12, i32 0, !4, null} -!33 = !{i32 13, i32 0, !4, null} +!31 = !MDLocation(line: 11, scope: !30) +!32 = !MDLocation(line: 12, scope: !4) +!33 = !MDLocation(line: 13, scope: !4) ; CHECK-FP-LABEL: sum ; CHECK-FP: .cfi_startproc diff --git a/llvm/test/CodeGen/ARM/debug-frame.ll b/llvm/test/CodeGen/ARM/debug-frame.ll index 98bbd9783da..16e2c4c59f9 100644 --- a/llvm/test/CodeGen/ARM/debug-frame.ll +++ b/llvm/test/CodeGen/ARM/debug-frame.ll @@ -142,27 +142,27 @@ declare void @_ZSt9terminatev() !11 = !{i32 1, !"Debug Info Version", i32 2} !12 = !{!"clang version 3.5 "} !13 = !{!"0x101\00a\0016777220\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [a] [line 4] -!14 = !{i32 4, i32 0, !4, null} +!14 = !MDLocation(line: 4, scope: !4) !15 = !{!"0x101\00b\0033554436\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [b] [line 4] !16 = !{!"0x101\00c\0050331652\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [c] [line 4] !17 = !{!"0x101\00d\0067108868\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [d] [line 4] !18 = !{!"0x101\00e\0083886084\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [e] [line 4] !19 = !{!"0x101\00m\00100663301\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [m] [line 5] -!20 = !{i32 5, i32 0, !4, null} +!20 = !MDLocation(line: 5, scope: !4) !21 = !{!"0x101\00n\00117440517\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [n] [line 5] !22 = !{!"0x101\00p\00134217733\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [p] [line 5] !23 = !{!"0x101\00q\00150994949\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [q] [line 5] !24 = !{!"0x101\00r\00167772165\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [r] [line 5] -!25 = !{i32 7, i32 0, !26, null} +!25 = !MDLocation(line: 7, scope: !26) !26 = !{!"0xb\006\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [/tmp/exp.cpp] -!27 = !{i32 8, i32 0, !26, null} -!28 = !{i32 11, i32 0, !26, null} -!29 = !{i32 9, i32 0, !30, null} +!27 = !MDLocation(line: 8, scope: !26) +!28 = !MDLocation(line: 11, scope: !26) +!29 = !MDLocation(line: 9, scope: !30) !30 = !{!"0xb\008\000\001", !1, !4} ; [ DW_TAG_lexical_block ] [/tmp/exp.cpp] -!31 = !{i32 10, i32 0, !30, null} -!32 = !{i32 10, i32 0, !4, null} -!33 = !{i32 11, i32 0, !4, null} -!34 = !{i32 11, i32 0, !30, null} +!31 = !MDLocation(line: 10, scope: !30) +!32 = !MDLocation(line: 10, scope: !4) +!33 = !MDLocation(line: 11, scope: !4) +!34 = !MDLocation(line: 11, scope: !30) ; CHECK-FP-LABEL: _Z4testiiiiiddddd: ; CHECK-FP: .cfi_startproc diff --git a/llvm/test/CodeGen/ARM/debug-info-arg.ll b/llvm/test/CodeGen/ARM/debug-info-arg.ll index a107c1e5682..8679589a486 100644 --- a/llvm/test/CodeGen/ARM/debug-info-arg.ll +++ b/llvm/test/CodeGen/ARM/debug-info-arg.ll @@ -52,16 +52,16 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !17 = !{!"0x101\00y\0067108875\000", !1, !2, !15} ; [ DW_TAG_arg_variable ] !18 = !{!"0x101\00ptr1\0083886091\000", !1, !2, !6} ; [ DW_TAG_arg_variable ] !19 = !{!"0x101\00ptr2\00100663307\000", !1, !2, !6} ; [ DW_TAG_arg_variable ] -!20 = !{i32 11, i32 24, !1, null} -!21 = !{i32 11, i32 44, !1, null} -!22 = !{i32 11, i32 54, !1, null} -!23 = !{i32 11, i32 64, !1, null} -!24 = !{i32 11, i32 81, !1, null} -!25 = !{i32 11, i32 101, !1, null} -!26 = !{i32 12, i32 3, !27, null} +!20 = !MDLocation(line: 11, column: 24, scope: !1) +!21 = !MDLocation(line: 11, column: 44, scope: !1) +!22 = !MDLocation(line: 11, column: 54, scope: !1) +!23 = !MDLocation(line: 11, column: 64, scope: !1) +!24 = !MDLocation(line: 11, column: 81, scope: !1) +!25 = !MDLocation(line: 11, column: 101, scope: !1) +!26 = !MDLocation(line: 12, column: 3, scope: !27) !27 = !{!"0xb\0011\00107\000", !2, !1} ; [ DW_TAG_lexical_block ] -!28 = !{i32 13, i32 5, !27, null} -!29 = !{i32 14, i32 1, !27, null} +!28 = !MDLocation(line: 13, column: 5, scope: !27) +!29 = !MDLocation(line: 14, column: 1, scope: !27) !30 = !{!1} !31 = !{!5, !13, !14, !17, !18, !19} !32 = !{!"one.c", !"/Volumes/Athwagate/R10048772"} diff --git a/llvm/test/CodeGen/ARM/debug-info-blocks.ll b/llvm/test/CodeGen/ARM/debug-info-blocks.ll index 05f259b0e6f..3bf6ad91c86 100644 --- a/llvm/test/CodeGen/ARM/debug-info-blocks.ll +++ b/llvm/test/CodeGen/ARM/debug-info-blocks.ll @@ -224,24 +224,24 @@ define hidden void @foobar_func_block_invoke_0(i8* %.block_descriptor, %0* %load !126 = !{!"0xf\00\000\0032\0032\000\000", null, !0, !127} ; [ DW_TAG_pointer_type ] !127 = !{!"0x13\00my_struct\0049\000\000\000\004\000", !159, !0, null, null, null, null, null} ; [ DW_TAG_structure_type ] [my_struct] [line 49, size 0, align 0, offset 0] [decl] [from ] !128 = !{!"0x29", !159} ; [ DW_TAG_file_type ] -!129 = !{i32 609, i32 144, !23, null} +!129 = !MDLocation(line: 609, column: 144, scope: !23) !130 = !{!"0x101\00loadedMydata\0033555041\000", !23, !24, !59} ; [ DW_TAG_arg_variable ] -!131 = !{i32 609, i32 155, !23, null} +!131 = !MDLocation(line: 609, column: 155, scope: !23) !132 = !{!"0x101\00bounds\0050332257\000", !23, !24, !108} ; [ DW_TAG_arg_variable ] -!133 = !{i32 609, i32 175, !23, null} +!133 = !MDLocation(line: 609, column: 175, scope: !23) !134 = !{!"0x101\00data\0067109473\000", !23, !24, !108} ; [ DW_TAG_arg_variable ] -!135 = !{i32 609, i32 190, !23, null} +!135 = !MDLocation(line: 609, column: 190, scope: !23) !136 = !{!"0x100\00mydata\00604\000", !23, !24, !50} ; [ DW_TAG_auto_variable ] -!137 = !{i32 604, i32 49, !23, null} +!137 = !MDLocation(line: 604, column: 49, scope: !23) !138 = !{!"0x100\00self\00604\000", !23, !40, !90} ; [ DW_TAG_auto_variable ] !139 = !{!"0x100\00semi\00607\000", !23, !24, !125} ; [ DW_TAG_auto_variable ] -!140 = !{i32 607, i32 30, !23, null} -!141 = !{i32 610, i32 17, !142, null} +!140 = !MDLocation(line: 607, column: 30, scope: !23) +!141 = !MDLocation(line: 610, column: 17, scope: !142) !142 = !{!"0xb\00609\00200\0094", !152, !23} ; [ DW_TAG_lexical_block ] -!143 = !{i32 611, i32 17, !142, null} -!144 = !{i32 612, i32 17, !142, null} -!145 = !{i32 613, i32 17, !142, null} -!146 = !{i32 615, i32 13, !142, null} +!143 = !MDLocation(line: 611, column: 17, scope: !142) +!144 = !MDLocation(line: 612, column: 17, scope: !142) +!145 = !MDLocation(line: 613, column: 17, scope: !142) +!146 = !MDLocation(line: 615, column: 13, scope: !142) !147 = !{!1, !1, !5, !5, !9, !14, !19, !19, !14, !14, !14, !19, !19, !19} !148 = !{!23} !149 = !{!"header3.h", !"/Volumes/Sandbox/llvm"} diff --git a/llvm/test/CodeGen/ARM/debug-info-branch-folding.ll b/llvm/test/CodeGen/ARM/debug-info-branch-folding.ll index 903b945302f..94756953de0 100644 --- a/llvm/test/CodeGen/ARM/debug-info-branch-folding.ll +++ b/llvm/test/CodeGen/ARM/debug-info-branch-folding.ll @@ -81,17 +81,17 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !36 = !{!"0x16\00v4sf\003\000\000\000\000", !55, !2, !6} ; [ DW_TAG_typedef ] !37 = !{!"0xd\00A\0024\00128\0032\000\000", !55, !15, !38} ; [ DW_TAG_member ] !38 = !{!"0x1\00\000\00128\0032\000\000", null, !2, !7, !8, i32 0, i32 0} ; [ DW_TAG_array_type ] -!39 = !{i32 79, i32 7, !40, null} +!39 = !MDLocation(line: 79, column: 7, scope: !40) !40 = !{!"0xb\0075\0035\0018", !1, !41} ; [ DW_TAG_lexical_block ] !41 = !{!"0xb\0075\005\0017", !1, !42} ; [ DW_TAG_lexical_block ] !42 = !{!"0xb\0071\0032\0016", !1, !43} ; [ DW_TAG_lexical_block ] !43 = !{!"0xb\0071\003\0015", !1, !25} ; [ DW_TAG_lexical_block ] -!44 = !{i32 75, i32 5, !42, null} -!45 = !{i32 42, i32 2, !46, !48} +!44 = !MDLocation(line: 75, column: 5, scope: !42) +!45 = !MDLocation(line: 42, column: 2, scope: !46, inlinedAt: !48) !46 = !{!"0xb\0042\002\0020", !15, !47} ; [ DW_TAG_lexical_block ] !47 = !{!"0xb\0041\0028\0019", !15, !14} ; [ DW_TAG_lexical_block ] -!48 = !{i32 95, i32 3, !25, null} -!49 = !{i32 99, i32 3, !25, null} +!48 = !MDLocation(line: 95, column: 3, scope: !25) +!49 = !MDLocation(line: 99, column: 3, scope: !25) !50 = !{!0, !10, !14} !51 = !{!18} !52 = !{!19, !20, !24, !26, !27, !28, !29} diff --git a/llvm/test/CodeGen/ARM/debug-info-d16-reg.ll b/llvm/test/CodeGen/ARM/debug-info-d16-reg.ll index 4bc5c46f4e9..85b510f175e 100644 --- a/llvm/test/CodeGen/ARM/debug-info-d16-reg.ll +++ b/llvm/test/CodeGen/ARM/debug-info-d16-reg.ll @@ -85,22 +85,22 @@ declare i32 @puts(i8* nocapture) nounwind !23 = !{!"0x101\00argv\0017\000", !10, !1, !13} ; [ DW_TAG_arg_variable ] !24 = !{!"0x100\00dval\0019\000", !25, !1, !7} ; [ DW_TAG_auto_variable ] !25 = !{!"0xb\0018\000\002", !46, !10} ; [ DW_TAG_lexical_block ] -!26 = !{i32 4, i32 0, !9, null} -!27 = !{i32 6, i32 0, !28, null} +!26 = !MDLocation(line: 4, scope: !9) +!27 = !MDLocation(line: 6, scope: !28) !28 = !{!"0xb\005\000\001", !46, !9} ; [ DW_TAG_lexical_block ] -!29 = !{i32 7, i32 0, !28, null} -!30 = !{i32 11, i32 0, !0, null} -!31 = !{i32 13, i32 0, !32, null} +!29 = !MDLocation(line: 7, scope: !28) +!30 = !MDLocation(line: 11, scope: !0) +!31 = !MDLocation(line: 13, scope: !32) !32 = !{!"0xb\0012\000\000", !46, !0} ; [ DW_TAG_lexical_block ] -!33 = !{i32 14, i32 0, !32, null} -!34 = !{i32 17, i32 0, !10, null} -!35 = !{i32 19, i32 0, !25, null} -!36 = !{i32 20, i32 0, !25, null} -!37 = !{i32 21, i32 0, !25, null} -!38 = !{i32 4, i32 0, !9, !37} -!39 = !{i32 6, i32 0, !28, !37} -!40 = !{i32 22, i32 0, !25, null} -!41 = !{i32 23, i32 0, !25, null} +!33 = !MDLocation(line: 14, scope: !32) +!34 = !MDLocation(line: 17, scope: !10) +!35 = !MDLocation(line: 19, scope: !25) +!36 = !MDLocation(line: 20, scope: !25) +!37 = !MDLocation(line: 21, scope: !25) +!38 = !MDLocation(line: 4, scope: !9, inlinedAt: !37) +!39 = !MDLocation(line: 6, scope: !28, inlinedAt: !37) +!40 = !MDLocation(line: 22, scope: !25) +!41 = !MDLocation(line: 23, scope: !25) !42 = !{!0, !9, !10} !43 = !{!16, !17, !18} !44 = !{!19, !20, !21} diff --git a/llvm/test/CodeGen/ARM/debug-info-qreg.ll b/llvm/test/CodeGen/ARM/debug-info-qreg.ll index 03a7e4b1bf1..c05df6ab3d5 100644 --- a/llvm/test/CodeGen/ARM/debug-info-qreg.ll +++ b/llvm/test/CodeGen/ARM/debug-info-qreg.ll @@ -77,17 +77,17 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !36 = !{!"0x16\00v4sf\003\000\000\000\000", !55, !2, !6} ; [ DW_TAG_typedef ] !37 = !{!"0xd\00A\0024\00128\0032\000\000", !55, !15, !38} ; [ DW_TAG_member ] !38 = !{!"0x1\00\000\00128\0032\000\000", null, !2, !7, !8, i32 0, i32 0} ; [ DW_TAG_array_type ] -!39 = !{i32 79, i32 7, !40, null} +!39 = !MDLocation(line: 79, column: 7, scope: !40) !40 = !{!"0xb\0075\0035\0018", !54, !41} ; [ DW_TAG_lexical_block ] !41 = !{!"0xb\0075\005\0017", !54, !42} ; [ DW_TAG_lexical_block ] !42 = !{!"0xb\0071\0032\0016", !54, !43} ; [ DW_TAG_lexical_block ] !43 = !{!"0xb\0071\003\0015", !54, !25} ; [ DW_TAG_lexical_block ] -!44 = !{i32 75, i32 5, !42, null} -!45 = !{i32 42, i32 2, !46, !48} +!44 = !MDLocation(line: 75, column: 5, scope: !42) +!45 = !MDLocation(line: 42, column: 2, scope: !46, inlinedAt: !48) !46 = !{!"0xb\0042\002\0020", !55, !47} ; [ DW_TAG_lexical_block ] !47 = !{!"0xb\0041\0028\0019", !55, !14} ; [ DW_TAG_lexical_block ] -!48 = !{i32 95, i32 3, !25, null} -!49 = !{i32 99, i32 3, !25, null} +!48 = !MDLocation(line: 95, column: 3, scope: !25) +!49 = !MDLocation(line: 99, column: 3, scope: !25) !50 = !{!0, !10, !14} !51 = !{!18} !52 = !{!19, !20, !24, !26, !27, !28, !29} diff --git a/llvm/test/CodeGen/ARM/debug-info-s16-reg.ll b/llvm/test/CodeGen/ARM/debug-info-s16-reg.ll index 54c38a751d2..9b303dde2e3 100644 --- a/llvm/test/CodeGen/ARM/debug-info-s16-reg.ll +++ b/llvm/test/CodeGen/ARM/debug-info-s16-reg.ll @@ -89,29 +89,29 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !21 = !{!"0x24\00char\000\008\008\000\000\006", null, !2} ; [ DW_TAG_base_type ] !22 = !{!"0x100\00dval\0019\000", !23, !1, !11} ; [ DW_TAG_auto_variable ] !23 = !{!"0xb\0018\001\002", !51, !7} ; [ DW_TAG_lexical_block ] -!24 = !{i32 4, i32 22, !0, null} -!25 = !{i32 4, i32 33, !0, null} -!26 = !{i32 4, i32 52, !0, null} -!27 = !{i32 6, i32 3, !28, null} +!24 = !MDLocation(line: 4, column: 22, scope: !0) +!25 = !MDLocation(line: 4, column: 33, scope: !0) +!26 = !MDLocation(line: 4, column: 52, scope: !0) +!27 = !MDLocation(line: 6, column: 3, scope: !28) !28 = !{!"0xb\005\001\000", !51, !0} ; [ DW_TAG_lexical_block ] -!29 = !{i32 7, i32 3, !28, null} -!30 = !{i32 11, i32 42, !6, null} -!31 = !{i32 11, i32 53, !6, null} -!32 = !{i32 11, i32 72, !6, null} -!33 = !{i32 13, i32 3, !34, null} +!29 = !MDLocation(line: 7, column: 3, scope: !28) +!30 = !MDLocation(line: 11, column: 42, scope: !6) +!31 = !MDLocation(line: 11, column: 53, scope: !6) +!32 = !MDLocation(line: 11, column: 72, scope: !6) +!33 = !MDLocation(line: 13, column: 3, scope: !34) !34 = !{!"0xb\0012\001\001", !51, !6} ; [ DW_TAG_lexical_block ] -!35 = !{i32 14, i32 3, !34, null} -!36 = !{i32 17, i32 15, !7, null} -!37 = !{i32 17, i32 28, !7, null} -!38 = !{i32 19, i32 31, !23, null} -!39 = !{i32 20, i32 3, !23, null} -!40 = !{i32 21, i32 3, !23, null} -!41 = !{i32 4, i32 22, !0, !40} -!42 = !{i32 4, i32 33, !0, !40} -!43 = !{i32 4, i32 52, !0, !40} -!44 = !{i32 6, i32 3, !28, !40} -!45 = !{i32 22, i32 3, !23, null} -!46 = !{i32 23, i32 1, !23, null} +!35 = !MDLocation(line: 14, column: 3, scope: !34) +!36 = !MDLocation(line: 17, column: 15, scope: !7) +!37 = !MDLocation(line: 17, column: 28, scope: !7) +!38 = !MDLocation(line: 19, column: 31, scope: !23) +!39 = !MDLocation(line: 20, column: 3, scope: !23) +!40 = !MDLocation(line: 21, column: 3, scope: !23) +!41 = !MDLocation(line: 4, column: 22, scope: !0, inlinedAt: !40) +!42 = !MDLocation(line: 4, column: 33, scope: !0, inlinedAt: !40) +!43 = !MDLocation(line: 4, column: 52, scope: !0, inlinedAt: !40) +!44 = !MDLocation(line: 6, column: 3, scope: !28, inlinedAt: !40) +!45 = !MDLocation(line: 22, column: 3, scope: !23) +!46 = !MDLocation(line: 23, column: 1, scope: !23) !47 = !{!0, !6, !7} !48 = !{!8, !10, !12} !49 = !{!14, !15, !16} diff --git a/llvm/test/CodeGen/ARM/debug-info-sreg2.ll b/llvm/test/CodeGen/ARM/debug-info-sreg2.ll index 32d4e4863bf..977a6f27677 100644 --- a/llvm/test/CodeGen/ARM/debug-info-sreg2.ll +++ b/llvm/test/CodeGen/ARM/debug-info-sreg2.ll @@ -54,11 +54,11 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !8 = !{!"0x100\00y\008\000", !9, !2, !7} ; [ DW_TAG_auto_variable ] !9 = !{!"0xb\007\0025\002", !18, !10} ; [ DW_TAG_lexical_block ] !10 = !{!"0xb\007\003\001", !18, !6} ; [ DW_TAG_lexical_block ] -!11 = !{i32 6, i32 18, !6, null} -!12 = !{i32 7, i32 3, !6, null} -!13 = !{i32 8, i32 20, !9, null} -!14 = !{i32 7, i32 20, !10, null} -!15 = !{i32 10, i32 1, !6, null} +!11 = !MDLocation(line: 6, column: 18, scope: !6) +!12 = !MDLocation(line: 7, column: 3, scope: !6) +!13 = !MDLocation(line: 8, column: 20, scope: !9) +!14 = !MDLocation(line: 7, column: 20, scope: !10) +!15 = !MDLocation(line: 10, column: 1, scope: !6) !16 = !{!1} !17 = !{!5, !8} !18 = !{!"k.cc", !"/private/tmp"} diff --git a/llvm/test/CodeGen/ARM/debug-segmented-stacks.ll b/llvm/test/CodeGen/ARM/debug-segmented-stacks.ll index a4f92ec6a4b..7ea5665a7a9 100644 --- a/llvm/test/CodeGen/ARM/debug-segmented-stacks.ll +++ b/llvm/test/CodeGen/ARM/debug-segmented-stacks.ll @@ -52,7 +52,7 @@ define void @test_basic() #0 { !10 = !{i32 1, !"Debug Info Version", i32 2} !11 = !{!"clang version 3.5 "} !12 = !{!"0x101\00count\0016777221\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [count] [line 5] -!13 = !{i32 5, i32 0, !4, null} +!13 = !MDLocation(line: 5, scope: !4) !14 = !{!"0x100\00vl\006\000", !4, !5, !15} ; [ DW_TAG_auto_variable ] [vl] [line 6] !15 = !{!"0x16\00va_list\0030\000\000\000\000", !16, null, !17} ; [ DW_TAG_typedef ] [va_list] [line 30, size 0, align 0, offset 0] [from __builtin_va_list] !16 = !{!"/linux-x86_64-high/gcc_4.7.2/dbg/llvm/bin/../lib/clang/3.5/include/stdarg.h", !"/tmp"} @@ -61,18 +61,18 @@ define void @test_basic() #0 { !19 = !{!20} !20 = !{!"0xd\00__ap\006\0032\0032\000\000", !1, !18, !21} ; [ DW_TAG_member ] [__ap] [line 6, size 32, align 32, offset 0] [from ] !21 = !{!"0xf\00\000\0032\0032\000\000", null, null, null} ; [ DW_TAG_pointer_type ] [line 0, size 32, align 32, offset 0] [from ] -!22 = !{i32 6, i32 0, !4, null} -!23 = !{i32 7, i32 0, !4, null} +!22 = !MDLocation(line: 6, scope: !4) +!23 = !MDLocation(line: 7, scope: !4) !24 = !{!"0x100\00test_basic\008\000", !4, !5, !8} ; [ DW_TAG_auto_variable ] [sum] [line 8] -!25 = !{i32 8, i32 0, !4, null} +!25 = !MDLocation(line: 8, scope: !4) !26 = !{!"0x100\00i\009\000", !27, !5, !8} ; [ DW_TAG_auto_variable ] [i] [line 9] !27 = !{!"0xb\009\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [/tmp/var.c] -!28 = !{i32 9, i32 0, !27, null} -!29 = !{i32 10, i32 0, !30, null} +!28 = !MDLocation(line: 9, scope: !27) +!29 = !MDLocation(line: 10, scope: !30) !30 = !{!"0xb\009\000\001", !1, !27} ; [ DW_TAG_lexical_block ] [/tmp/var.c] -!31 = !{i32 11, i32 0, !30, null} -!32 = !{i32 12, i32 0, !4, null} -!33 = !{i32 13, i32 0, !4, null} +!31 = !MDLocation(line: 11, scope: !30) +!32 = !MDLocation(line: 12, scope: !4) +!33 = !MDLocation(line: 13, scope: !4) ; Just to prevent the alloca from being optimized away declare void @dummy_use(i32*, i32) diff --git a/llvm/test/CodeGen/Hexagon/hwloop-dbg.ll b/llvm/test/CodeGen/Hexagon/hwloop-dbg.ll index 2a34329f613..3c05884f6a7 100644 --- a/llvm/test/CodeGen/Hexagon/hwloop-dbg.ll +++ b/llvm/test/CodeGen/Hexagon/hwloop-dbg.ll @@ -51,14 +51,14 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !14 = !{!"0x101\00b\0033554433\000", !5, !6, !9} ; [ DW_TAG_arg_variable ] [b] [line 1] !15 = !{!"0x100\00i\002\000", !16, !6, !10} ; [ DW_TAG_auto_variable ] [i] [line 2] !16 = !{!"0xb\001\0026\000", !28, !5} ; [ DW_TAG_lexical_block ] [/usr2/kparzysz/s.hex/t/hwloop-dbg.c] -!17 = !{i32 1, i32 15, !5, null} -!18 = !{i32 1, i32 23, !5, null} -!19 = !{i32 3, i32 8, !20, null} +!17 = !MDLocation(line: 1, column: 15, scope: !5) +!18 = !MDLocation(line: 1, column: 23, scope: !5) +!19 = !MDLocation(line: 3, column: 8, scope: !20) !20 = !{!"0xb\003\003\001", !28, !16} ; [ DW_TAG_lexical_block ] [/usr2/kparzysz/s.hex/t/hwloop-dbg.c] -!21 = !{i32 4, i32 5, !22, null} +!21 = !MDLocation(line: 4, column: 5, scope: !22) !22 = !{!"0xb\003\0028\002", !28, !20} ; [ DW_TAG_lexical_block ] [/usr2/kparzysz/s.hex/t/hwloop-dbg.c] -!26 = !{i32 3, i32 23, !20, null} -!27 = !{i32 6, i32 1, !16, null} +!26 = !MDLocation(line: 3, column: 23, scope: !20) +!27 = !MDLocation(line: 6, column: 1, scope: !16) !28 = !{!"hwloop-dbg.c", !"/usr2/kparzysz/s.hex/t"} !29 = !{i32 1, !"Debug Info Version", i32 2} !30 = !{i32 0} diff --git a/llvm/test/CodeGen/Inputs/DbgValueOtherTargets.ll b/llvm/test/CodeGen/Inputs/DbgValueOtherTargets.ll index e35ebbab723..d21a4eebe24 100644 --- a/llvm/test/CodeGen/Inputs/DbgValueOtherTargets.ll +++ b/llvm/test/CodeGen/Inputs/DbgValueOtherTargets.ll @@ -23,8 +23,8 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !6 = !{i32 0} !7 = !{!"0x100\00i\003\000", !8, !1, !5} ; [ DW_TAG_auto_variable ] !8 = !{!"0xb\002\0012\000", !12, !0} ; [ DW_TAG_lexical_block ] -!9 = !{i32 3, i32 11, !8, null} -!10 = !{i32 4, i32 2, !8, null} +!9 = !MDLocation(line: 3, column: 11, scope: !8) +!10 = !MDLocation(line: 4, column: 2, scope: !8) !11 = !{!0} !12 = !{!"/tmp/x.c", !"/Users/manav"} !13 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/CodeGen/PowerPC/dbg.ll b/llvm/test/CodeGen/PowerPC/dbg.ll index 361876144a0..bd153674eab 100644 --- a/llvm/test/CodeGen/PowerPC/dbg.ll +++ b/llvm/test/CodeGen/PowerPC/dbg.ll @@ -31,9 +31,9 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !13 = !{!15, !16} !15 = !{!"0x101\00argc\0016777217\000", !5, !6, !9} ; [ DW_TAG_arg_variable ] !16 = !{!"0x101\00argv\0033554433\000", !5, !6, !10} ; [ DW_TAG_arg_variable ] -!17 = !{i32 1, i32 14, !5, null} -!18 = !{i32 1, i32 26, !5, null} -!19 = !{i32 2, i32 3, !20, null} +!17 = !MDLocation(line: 1, column: 14, scope: !5) +!18 = !MDLocation(line: 1, column: 26, scope: !5) +!19 = !MDLocation(line: 2, column: 3, scope: !20) !20 = !{!"0xb\001\0034\000", !21, !5} ; [ DW_TAG_lexical_block ] !21 = !{!"dbg.c", !"/src"} !22 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/CodeGen/PowerPC/pr17168.ll b/llvm/test/CodeGen/PowerPC/pr17168.ll index bef67e81e09..62a9ede0200 100644 --- a/llvm/test/CodeGen/PowerPC/pr17168.ll +++ b/llvm/test/CodeGen/PowerPC/pr17168.ll @@ -493,26 +493,26 @@ attributes #1 = { nounwind readnone } !436 = !{!"0x34\00tmp2\00tmp2\00\0088\001\001", null, !300, !20, null, null} ; [ DW_TAG_variable ] [tmp2] [line 88] [local] [def] !437 = !{!"0x34\00tmp1\00tmp1\00\0088\001\001", null, !300, !20, null, null} ; [ DW_TAG_variable ] [tmp1] [line 88] [local] [def] !438 = !{i32 2, !"Dwarf Version", i32 4} -!439 = !{i32 1898, i32 0, !440, null} +!439 = !MDLocation(line: 1898, scope: !440) !440 = !{!"0xb\001898\000\00107", !1, !114} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c] -!441 = !{i32 1913, i32 0, !442, null} +!441 = !MDLocation(line: 1913, scope: !442) !442 = !{!"0xb\001913\000\00115", !1, !114} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c] -!443 = !{i32 1923, i32 0, !114, null} +!443 = !MDLocation(line: 1923, scope: !114) !444 = !{!"int", !445} !445 = !{!"omnipotent char", !446} !446 = !{!"Simple C/C++ TBAA"} !447 = !{i32 1} -!448 = !{i32 1925, i32 0, !449, null} +!448 = !MDLocation(line: 1925, scope: !449) !449 = !{!"0xb\001925\000\00121", !1, !114} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c] -!450 = !{i32 1939, i32 0, !451, null} +!450 = !MDLocation(line: 1939, scope: !451) !451 = !{!"0xb\001939\000\00127", !1, !114} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c] -!452 = !{i32 1940, i32 0, !453, null} +!452 = !MDLocation(line: 1940, scope: !453) !453 = !{!"0xb\001940\000\00129", !1, !454} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c] !454 = !{!"0xb\001939\000\00128", !1, !451} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c] -!455 = !{i32 1941, i32 0, !456, null} +!455 = !MDLocation(line: 1941, scope: !456) !456 = !{!"0xb\001941\000\00131", !1, !457} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c] !457 = !{!"0xb\001940\000\00130", !1, !453} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c] -!458 = !{i32 2020, i32 0, !459, null} +!458 = !MDLocation(line: 2020, scope: !459) !459 = !{!"0xb\002020\000\00149", !1, !460} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c] !460 = !{!"0xb\002019\000\00148", !1, !461} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c] !461 = !{!"0xb\002019\000\00147", !1, !462} ; [ DW_TAG_lexical_block ] [/home/hfinkel/src/NPB2.3-omp-C/BT/bt.c] diff --git a/llvm/test/CodeGen/PowerPC/unwind-dw2-g.ll b/llvm/test/CodeGen/PowerPC/unwind-dw2-g.ll index 0b1bcb33af9..4ae6ff24a03 100644 --- a/llvm/test/CodeGen/PowerPC/unwind-dw2-g.ll +++ b/llvm/test/CodeGen/PowerPC/unwind-dw2-g.ll @@ -30,6 +30,6 @@ attributes #0 = { nounwind } !6 = !{!"0x15\00\000\000\000\000\000\000", i32 0, null, null, !7, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ] !7 = !{null} !8 = !{i32 2, !"Dwarf Version", i32 3} -!9 = !{i32 2, i32 0, !4, null} -!10 = !{i32 3, i32 0, !4, null} +!9 = !MDLocation(line: 2, scope: !4) +!10 = !MDLocation(line: 3, scope: !4) !11 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/CodeGen/Thumb/2010-07-15-debugOrdering.ll b/llvm/test/CodeGen/Thumb/2010-07-15-debugOrdering.ll index 1403fe020b9..622f55d994f 100644 --- a/llvm/test/CodeGen/Thumb/2010-07-15-debugOrdering.ll +++ b/llvm/test/CodeGen/Thumb/2010-07-15-debugOrdering.ll @@ -48,7 +48,7 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !llvm.dbg.cu = !{!5} !llvm.module.flags = !{!104} -!0 = !{i32 46, i32 0, !1, null} +!0 = !MDLocation(line: 46, scope: !1) !1 = !{!"0xb\0044\000\000", !101, !2} ; [ DW_TAG_lexical_block ] !2 = !{!"0xb\0044\000\000", !101, !3} ; [ DW_TAG_lexical_block ] !3 = !{!"0x2e\00getClosestDiagonal3\00getClosestDiagonal3\00_Z19getClosestDiagonal3ii\0044\000\001\000\006\000\000\000", !101, null, !6, null, null, null, null, null} ; [ DW_TAG_subprogram ] @@ -142,13 +142,13 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !89 = !{!"0x2e\00indexOfMaxComponent\00indexOfMaxComponent\00_ZNK9ggVector319indexOfMaxComponentEv\00146\000\000\000\006\000\000\000", !9, !8, !86, null, null, null, null, null} ; [ DW_TAG_subprogram ] !90 = !{!"0x2e\00indexOfMaxAbsComponent\00indexOfMaxAbsComponent\00_ZNK9ggVector322indexOfMaxAbsComponentEv\00150\000\000\000\006\000\000\000", !9, !8, !86, null, null, null, null, null} ; [ DW_TAG_subprogram ] !91 = !{!"0x100\00vx\0046\000", !1, !4, !13} ; [ DW_TAG_auto_variable ] -!92 = !{i32 48, i32 0, !1, null} -!93 = !{i32 218, i32 0, !94, !96} +!92 = !MDLocation(line: 48, scope: !1) +!93 = !MDLocation(line: 218, scope: !94, inlinedAt: !96) !94 = !{!"0xb\00217\000\000", !101, !95} ; [ DW_TAG_lexical_block ] !95 = !{!"0xb\00217\000\000", !101, !77} ; [ DW_TAG_lexical_block ] -!96 = !{i32 51, i32 0, !1, null} -!97 = !{i32 227, i32 0, !94, !96} -!98 = !{i32 52, i32 0, !1, null} +!96 = !MDLocation(line: 51, scope: !1) +!97 = !MDLocation(line: 227, scope: !94, inlinedAt: !96) +!98 = !MDLocation(line: 52, scope: !1) !101 = !{!"ggEdgeDiscrepancy.cc", !"/Volumes/Home/grosbaj/sources/llvm-externals/speccpu2000/benchspec/CINT2000/252.eon/src"} !102 = !{i32 0} !103 = !{!3, !77} diff --git a/llvm/test/CodeGen/X86/2009-02-12-DebugInfoVLA.ll b/llvm/test/CodeGen/X86/2009-02-12-DebugInfoVLA.ll index 803ddf14250..6c8e3b5a8fd 100644 --- a/llvm/test/CodeGen/X86/2009-02-12-DebugInfoVLA.ll +++ b/llvm/test/CodeGen/X86/2009-02-12-DebugInfoVLA.ll @@ -73,15 +73,15 @@ declare void @llvm.stackrestore(i8*) nounwind !4 = !{!5, !6} !5 = !{!"0x24\00char\000\008\008\000\000\006", null, !2} ; [ DW_TAG_base_type ] !6 = !{!"0xf\00\000\0064\0064\000\000", null, !2, !5} ; [ DW_TAG_pointer_type ] -!7 = !{i32 2, i32 0, !1, null} +!7 = !MDLocation(line: 2, scope: !1) !8 = !{!"0x100\00str.0\003\000", !1, !2, !9} ; [ DW_TAG_auto_variable ] !9 = !{!"0xf\00\000\0064\0064\000\0064", null, !2, !10} ; [ DW_TAG_pointer_type ] !10 = !{!"0x1\00\000\008\008\000\000", null, !2, !5, !11, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 8, align 8, offset 0] [from char] !11 = !{!12} !12 = !{!"0x21\000\001"} ; [ DW_TAG_subrange_type ] -!13 = !{i32 3, i32 0, !14, null} +!13 = !MDLocation(line: 3, scope: !14) !14 = !{!"0xb\000\000\000", !17, !1} ; [ DW_TAG_lexical_block ] -!15 = !{i32 4, i32 0, !14, null} -!16 = !{i32 5, i32 0, !14, null} +!15 = !MDLocation(line: 4, scope: !14) +!16 = !MDLocation(line: 5, scope: !14) !17 = !{!"vla.c", !"/tmp/"} !18 = !{i32 0} diff --git a/llvm/test/CodeGen/X86/2009-10-16-Scope.ll b/llvm/test/CodeGen/X86/2009-10-16-Scope.ll index 52a6a5e82f6..e75d594e668 100644 --- a/llvm/test/CodeGen/X86/2009-10-16-Scope.ll +++ b/llvm/test/CodeGen/X86/2009-10-16-Scope.ll @@ -22,13 +22,13 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone declare i32 @foo(i32) ssp -!0 = !{i32 5, i32 2, !1, null} +!0 = !MDLocation(line: 5, column: 2, scope: !1) !1 = !{!"0xb\001\001\000", null, !2}; [DW_TAG_lexical_block ] !2 = !{!"0x2e\00bar\00bar\00bar\004\000\001\000\006\000\000\000", i32 0, !3, null, null, null, null, null, null} ; [ DW_TAG_subprogram ] !3 = !{!"0x11\0012\00clang 1.1\001\00\000\00\000", !8, null, !9, null, null, null}; [DW_TAG_compile_unit ] !4 = !{!"0x100\00count_\005\000", !5, !3, !6}; [ DW_TAG_auto_variable ] !5 = !{!"0xb\001\001\000", null, !1}; [DW_TAG_lexical_block ] !6 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !3}; [DW_TAG_base_type ] -!7 = !{i32 6, i32 1, !2, null} +!7 = !MDLocation(line: 6, column: 1, scope: !2) !8 = !{!"genmodes.i", !"/Users/yash/Downloads"} !9 = !{i32 0} diff --git a/llvm/test/CodeGen/X86/2010-01-18-DbgValue.ll b/llvm/test/CodeGen/X86/2010-01-18-DbgValue.ll index 1afb3aa0772..b21846d3949 100644 --- a/llvm/test/CodeGen/X86/2010-01-18-DbgValue.ll +++ b/llvm/test/CodeGen/X86/2010-01-18-DbgValue.ll @@ -46,8 +46,8 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !12 = !{!"0xd\00x\002\0064\0064\000\000", !19, !10, !6} ; [ DW_TAG_member ] !13 = !{!"0xd\00y\003\0064\0064\0064\000", !19, !10, !6} ; [ DW_TAG_member ] !14 = !{!"0xd\00P2\008\00128\0064\00128\000", !19, !7, !10} ; [ DW_TAG_member ] -!15 = !{i32 11, i32 0, !1, null} -!16 = !{i32 12, i32 0, !17, null} +!15 = !MDLocation(line: 11, scope: !1) +!16 = !MDLocation(line: 12, scope: !17) !17 = !{!"0xb\0011\000\000", !19, !1} ; [ DW_TAG_lexical_block ] !18 = !{!1} !19 = !{!"b2.c", !"/tmp/"} diff --git a/llvm/test/CodeGen/X86/2010-05-25-DotDebugLoc.ll b/llvm/test/CodeGen/X86/2010-05-25-DotDebugLoc.ll index b0b4d1754ed..0d30a3f88eb 100644 --- a/llvm/test/CodeGen/X86/2010-05-25-DotDebugLoc.ll +++ b/llvm/test/CodeGen/X86/2010-05-25-DotDebugLoc.ll @@ -219,30 +219,30 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !16 = !{!"0x100\00ratio\001923\000", !15, !2, !9} ; [ DW_TAG_auto_variable ] !17 = !{!"0x100\00x\001923\000", !15, !2, !9} ; [ DW_TAG_auto_variable ] !18 = !{!"0x100\00y\001923\000", !15, !2, !9} ; [ DW_TAG_auto_variable ] -!19 = !{i32 1929, i32 0, !15, null} -!20 = !{i32 1931, i32 0, !15, null} -!21 = !{i32 1932, i32 0, !15, null} -!22 = !{i32 1933, i32 0, !15, null} -!23 = !{i32 1934, i32 0, !15, null} -!24 = !{i32 1938, i32 0, !15, null} -!25 = !{i32 1939, i32 0, !15, null} -!26 = !{i32 1940, i32 0, !15, null} -!27 = !{i32 1941, i32 0, !15, null} -!28 = !{i32 1946, i32 0, !15, null} -!29 = !{i32 1948, i32 0, !15, null} -!30 = !{i32 1950, i32 0, !15, null} -!31 = !{i32 1951, i32 0, !15, null} -!32 = !{i32 1953, i32 0, !15, null} -!33 = !{i32 1955, i32 0, !15, null} -!34 = !{i32 1956, i32 0, !15, null} -!35 = !{i32 1957, i32 0, !15, null} -!36 = !{i32 1958, i32 0, !15, null} -!37 = !{i32 1960, i32 0, !15, null} -!38 = !{i32 1962, i32 0, !15, null} -!39 = !{i32 1963, i32 0, !15, null} -!40 = !{i32 1964, i32 0, !15, null} -!41 = !{i32 1965, i32 0, !15, null} -!42 = !{i32 1969, i32 0, !15, null} +!19 = !MDLocation(line: 1929, scope: !15) +!20 = !MDLocation(line: 1931, scope: !15) +!21 = !MDLocation(line: 1932, scope: !15) +!22 = !MDLocation(line: 1933, scope: !15) +!23 = !MDLocation(line: 1934, scope: !15) +!24 = !MDLocation(line: 1938, scope: !15) +!25 = !MDLocation(line: 1939, scope: !15) +!26 = !MDLocation(line: 1940, scope: !15) +!27 = !MDLocation(line: 1941, scope: !15) +!28 = !MDLocation(line: 1946, scope: !15) +!29 = !MDLocation(line: 1948, scope: !15) +!30 = !MDLocation(line: 1950, scope: !15) +!31 = !MDLocation(line: 1951, scope: !15) +!32 = !MDLocation(line: 1953, scope: !15) +!33 = !MDLocation(line: 1955, scope: !15) +!34 = !MDLocation(line: 1956, scope: !15) +!35 = !MDLocation(line: 1957, scope: !15) +!36 = !MDLocation(line: 1958, scope: !15) +!37 = !MDLocation(line: 1960, scope: !15) +!38 = !MDLocation(line: 1962, scope: !15) +!39 = !MDLocation(line: 1963, scope: !15) +!40 = !MDLocation(line: 1964, scope: !15) +!41 = !MDLocation(line: 1965, scope: !15) +!42 = !MDLocation(line: 1969, scope: !15) !43 = !{!0, !11, !12, !13, !14, !16, !17, !18} !44 = !{!1} !45 = !{!"libgcc2.c", !"/Users/yash/clean/LG.D/gcc/../../llvmgcc/gcc"} diff --git a/llvm/test/CodeGen/X86/2010-05-26-DotDebugLoc.ll b/llvm/test/CodeGen/X86/2010-05-26-DotDebugLoc.ll index 7bf3de56037..9915a706e5e 100644 --- a/llvm/test/CodeGen/X86/2010-05-26-DotDebugLoc.ll +++ b/llvm/test/CodeGen/X86/2010-05-26-DotDebugLoc.ll @@ -52,9 +52,9 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !25 = !{!"0x101\00argv\0022\000", !19, !1, !22} ; [ DW_TAG_arg_variable ] !26 = !{!"0x100\00e\0023\000", !27, !1, !14} ; [ DW_TAG_auto_variable ] !27 = !{!"0xb\0022\000\000", !36, !19} ; [ DW_TAG_lexical_block ] -!28 = !{i32 18, i32 0, !29, null} +!28 = !MDLocation(line: 18, scope: !29) !29 = !{!"0xb\0017\000\001", !36, !9} ; [ DW_TAG_lexical_block ] -!30 = !{i32 19, i32 0, !29, null} +!30 = !MDLocation(line: 19, scope: !29) !31 = !{!0} !32 = !{!5, !9, !19} !33 = !{!4} diff --git a/llvm/test/CodeGen/X86/2010-05-28-Crash.ll b/llvm/test/CodeGen/X86/2010-05-28-Crash.ll index 7bdfdf3b27a..7adacf5e017 100644 --- a/llvm/test/CodeGen/X86/2010-05-28-Crash.ll +++ b/llvm/test/CodeGen/X86/2010-05-28-Crash.ll @@ -34,11 +34,11 @@ entry: !6 = !{!"0x24\00int\000\0032\0032\000\000\005", !18, !2} ; [ DW_TAG_base_type ] !7 = !{!"0x101\00x\006\000", !8, !2, !6} ; [ DW_TAG_arg_variable ] !8 = !{!"0x2e\00bar\00bar\00bar\006\000\001\000\006\000\001\006", !18, !2, !4, null, i32 (i32)* @bar, null, null, !16} ; [ DW_TAG_subprogram ] -!9 = !{i32 3, i32 0, !10, null} +!9 = !MDLocation(line: 3, scope: !10) !10 = !{!"0xb\002\000\000", !18, !1} ; [ DW_TAG_lexical_block ] !11 = !{i32 1} -!12 = !{i32 3, i32 0, !10, !13} -!13 = !{i32 7, i32 0, !14, null} +!12 = !MDLocation(line: 3, scope: !10, inlinedAt: !13) +!13 = !MDLocation(line: 7, scope: !14) !14 = !{!"0xb\006\000\000", !18, !8} ; [ DW_TAG_lexical_block ] !15 = !{!0} !16 = !{!7} diff --git a/llvm/test/CodeGen/X86/2010-06-01-DeadArg-DbgInfo.ll b/llvm/test/CodeGen/X86/2010-06-01-DeadArg-DbgInfo.ll index fb4e420f73f..3687b828c4a 100644 --- a/llvm/test/CodeGen/X86/2010-06-01-DeadArg-DbgInfo.ll +++ b/llvm/test/CodeGen/X86/2010-06-01-DeadArg-DbgInfo.ll @@ -52,7 +52,7 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !26 = !{!"0xb\0019\000\000", !31, !27} ; [ DW_TAG_lexical_block ] !27 = !{!"0xb\0019\000\000", !31, !18} ; [ DW_TAG_lexical_block ] !28 = !{!"0x100\00b\0021\000", !26, !3, !7} ; [ DW_TAG_auto_variable ] -!29 = !{i32 16, i32 0, !30, null} +!29 = !MDLocation(line: 16, scope: !30) !30 = !{!"0xb\0015\000\000", !31, !8} ; [ DW_TAG_lexical_block ] !31 = !{!"foo.cp", !"/tmp/"} !32 = !{i32 0} diff --git a/llvm/test/CodeGen/X86/2010-07-06-DbgCrash.ll b/llvm/test/CodeGen/X86/2010-07-06-DbgCrash.ll index 232a90dbc1c..457c49852dc 100644 --- a/llvm/test/CodeGen/X86/2010-07-06-DbgCrash.ll +++ b/llvm/test/CodeGen/X86/2010-07-06-DbgCrash.ll @@ -17,7 +17,7 @@ !104 = !{!"0x1\00\000\0085312\0064\000\000", !109, null, !46, !105, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 85312, align 64, offset 0] [from ] !105 = !{!106} !106 = !{!"0x21\000\001333"} ; [ DW_TAG_subrange_type ] -!107 = !{i32 73, i32 0, !103, null} +!107 = !MDLocation(line: 73, scope: !103) !108 = !{i32 0} !109 = !{!"pbmsrch.c", !"/Users/grawp/LLVM/test-suite/MultiSource/Benchmarks/MiBench/office-stringsearch"} diff --git a/llvm/test/CodeGen/X86/2010-08-04-StackVariable.ll b/llvm/test/CodeGen/X86/2010-08-04-StackVariable.ll index d85bcd9c032..e3decf0c889 100644 --- a/llvm/test/CodeGen/X86/2010-08-04-StackVariable.ll +++ b/llvm/test/CodeGen/X86/2010-08-04-StackVariable.ll @@ -102,28 +102,28 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !21 = !{!"0x15\00\000\000\000\000\000\000", !47, !2, null, !22, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ] !22 = !{!13} !23 = !{!"0x101\00i\0016\000", !17, !2, !13} ; [ DW_TAG_arg_variable ] -!24 = !{i32 16, i32 0, !17, null} +!24 = !MDLocation(line: 16, scope: !17) !25 = !{!"0x101\00location\0016\000", !17, !2, !26} ; [ DW_TAG_arg_variable ] !26 = !{!"0x10\00SVal\000\0064\0064\000\000", !47, !2, !1} ; [ DW_TAG_reference_type ] -!27 = !{i32 17, i32 0, !28, null} +!27 = !MDLocation(line: 17, scope: !28) !28 = !{!"0xb\0016\000\002", !47, !17} ; [ DW_TAG_lexical_block ] -!29 = !{i32 18, i32 0, !28, null} -!30 = !{i32 20, i32 0, !28, null} +!29 = !MDLocation(line: 18, scope: !28) +!30 = !MDLocation(line: 20, scope: !28) !31 = !{!"0x101\00this\0011\000", !16, !2, !32} ; [ DW_TAG_arg_variable ] !32 = !{!"0x26\00\000\0064\0064\000\0064", !47, !2, !33} ; [ DW_TAG_const_type ] !33 = !{!"0xf\00\000\0064\0064\000\000", !47, !2, !1} ; [ DW_TAG_pointer_type ] -!34 = !{i32 11, i32 0, !16, null} -!35 = !{i32 11, i32 0, !36, null} +!34 = !MDLocation(line: 11, scope: !16) +!35 = !MDLocation(line: 11, scope: !36) !36 = !{!"0xb\0011\000\001", !47, !37} ; [ DW_TAG_lexical_block ] !37 = !{!"0xb\0011\000\000", !47, !16} ; [ DW_TAG_lexical_block ] !38 = !{!"0x100\00v\0024\000", !39, !2, !1} ; [ DW_TAG_auto_variable ] !39 = !{!"0xb\0023\000\004", !47, !40} ; [ DW_TAG_lexical_block ] !40 = !{!"0xb\0023\000\003", !47, !20} ; [ DW_TAG_lexical_block ] -!41 = !{i32 24, i32 0, !39, null} -!42 = !{i32 25, i32 0, !39, null} -!43 = !{i32 26, i32 0, !39, null} +!41 = !MDLocation(line: 24, scope: !39) +!42 = !MDLocation(line: 25, scope: !39) +!43 = !MDLocation(line: 26, scope: !39) !44 = !{!"0x100\00k\0026\000", !39, !2, !13} ; [ DW_TAG_auto_variable ] -!45 = !{i32 27, i32 0, !39, null} +!45 = !MDLocation(line: 27, scope: !39) !47 = !{!"small.cc", !"/Users/manav/R8248330"} !48 = !{i32 0} !49 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/CodeGen/X86/2010-09-16-EmptyFilename.ll b/llvm/test/CodeGen/X86/2010-09-16-EmptyFilename.ll index a6f2ba9b37c..cf9897ac03a 100644 --- a/llvm/test/CodeGen/X86/2010-09-16-EmptyFilename.ll +++ b/llvm/test/CodeGen/X86/2010-09-16-EmptyFilename.ll @@ -23,9 +23,9 @@ entry: !5 = !{!"0x24\00int\000\0032\0032\000\000\005", !14, !1} ; [ DW_TAG_base_type ] !6 = !{!"0x2e\00bar\00bar\00bar\004\000\001\000\006\000\000\000", !15, !7, !3, null, i32 ()* @bar, null, null, null} ; [ DW_TAG_subprogram ] !7 = !{!"0x29", !15} ; [ DW_TAG_file_type ] -!8 = !{i32 53, i32 13, !9, null} +!8 = !MDLocation(line: 53, column: 13, scope: !9) !9 = !{!"0xb\0053\0011\000", !14, !0} ; [ DW_TAG_lexical_block ] -!10 = !{i32 4, i32 13, !11, null} +!10 = !MDLocation(line: 4, column: 13, scope: !11) !11 = !{!"0xb\004\0013\002", !15, !12} ; [ DW_TAG_lexical_block ] !12 = !{!"0xb\004\0011\001", !15, !6} ; [ DW_TAG_lexical_block ] !13 = !{!0, !6} diff --git a/llvm/test/CodeGen/X86/2010-11-02-DbgParameter.ll b/llvm/test/CodeGen/X86/2010-11-02-DbgParameter.ll index 3ba1ee05a7e..df3aa1f2ab3 100644 --- a/llvm/test/CodeGen/X86/2010-11-02-DbgParameter.ll +++ b/llvm/test/CodeGen/X86/2010-11-02-DbgParameter.ll @@ -30,8 +30,8 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !9 = !{!10, !11} !10 = !{!"0xd\00x\002\0032\0032\000\000", !17, !1, !5} ; [ DW_TAG_member ] !11 = !{!"0xd\00y\002\0032\0032\0032\000", !17, !1, !5} ; [ DW_TAG_member ] -!12 = !{i32 3, i32 47, !0, null} -!13 = !{i32 4, i32 2, !14, null} +!12 = !MDLocation(line: 3, column: 47, scope: !0) +!13 = !MDLocation(line: 4, column: 2, scope: !14) !14 = !{!"0xb\003\0050\000", !17, !0} ; [ DW_TAG_lexical_block ] !15 = !{!0} !16 = !{!6} diff --git a/llvm/test/CodeGen/X86/2011-01-24-DbgValue-Before-Use.ll b/llvm/test/CodeGen/X86/2011-01-24-DbgValue-Before-Use.ll index 74746b9a20d..8404020c91f 100644 --- a/llvm/test/CodeGen/X86/2011-01-24-DbgValue-Before-Use.ll +++ b/llvm/test/CodeGen/X86/2011-01-24-DbgValue-Before-Use.ll @@ -96,16 +96,16 @@ declare i32 @puts(i8* nocapture) nounwind !15 = !{!"0xb\0025\0012\002", !31, !6} ; [ DW_TAG_lexical_block ] !16 = !{!"0x24\00unsigned int\000\0032\0032\000\000\007", null, !2} ; [ DW_TAG_base_type ] !17 = !{!"0x100\00z_s\0027\000", !15, !1, !9} ; [ DW_TAG_auto_variable ] -!18 = !{i32 5, i32 41, !0, null} -!19 = !{i32 5, i32 49, !0, null} -!20 = !{i32 7, i32 5, !13, null} -!21 = !{i32 8, i32 9, !22, null} +!18 = !MDLocation(line: 5, column: 41, scope: !0) +!19 = !MDLocation(line: 5, column: 49, scope: !0) +!20 = !MDLocation(line: 7, column: 5, scope: !13) +!21 = !MDLocation(line: 8, column: 9, scope: !22) !22 = !{!"0xb\007\0014\001", !31, !13} ; [ DW_TAG_lexical_block ] -!23 = !{i32 9, i32 9, !22, null} -!24 = !{i32 26, i32 38, !15, null} -!25 = !{i32 27, i32 38, !15, null} -!26 = !{i32 28, i32 9, !15, null} -!27 = !{i32 30, i32 1, !15, null} +!23 = !MDLocation(line: 9, column: 9, scope: !22) +!24 = !MDLocation(line: 26, column: 38, scope: !15) +!25 = !MDLocation(line: 27, column: 38, scope: !15) +!26 = !MDLocation(line: 28, column: 9, scope: !15) +!27 = !MDLocation(line: 30, column: 1, scope: !15) !28 = !{!0, !6} !29 = !{!10, !11, !12} !30 = !{!14, !17} diff --git a/llvm/test/CodeGen/X86/MachineSink-DbgValue.ll b/llvm/test/CodeGen/X86/MachineSink-DbgValue.ll index 06d2d36d3c5..3a2c58f97e8 100644 --- a/llvm/test/CodeGen/X86/MachineSink-DbgValue.ll +++ b/llvm/test/CodeGen/X86/MachineSink-DbgValue.ll @@ -40,12 +40,12 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !9 = !{!"0x24\00char\000\008\008\000\000\006", null, !0} ; [ DW_TAG_base_type ] !10 = !{!"0x100\00a\003\000", !11, !2, !9} ; [ DW_TAG_auto_variable ] !11 = !{!"0xb\002\0025\000", !20, !1} ; [ DW_TAG_lexical_block ] -!12 = !{i32 2, i32 13, !1, null} -!13 = !{i32 2, i32 22, !1, null} -!14 = !{i32 3, i32 14, !11, null} -!15 = !{i32 4, i32 3, !11, null} -!16 = !{i32 5, i32 5, !11, null} -!17 = !{i32 7, i32 1, !11, null} +!12 = !MDLocation(line: 2, column: 13, scope: !1) +!13 = !MDLocation(line: 2, column: 22, scope: !1) +!14 = !MDLocation(line: 3, column: 14, scope: !11) +!15 = !MDLocation(line: 4, column: 3, scope: !11) +!16 = !MDLocation(line: 5, column: 5, scope: !11) +!17 = !MDLocation(line: 7, column: 1, scope: !11) !18 = !{!1} !19 = !{!6, !7, !10} !20 = !{!"a.c", !"/private/tmp"} diff --git a/llvm/test/CodeGen/X86/dbg-changes-codegen-branch-folding.ll b/llvm/test/CodeGen/X86/dbg-changes-codegen-branch-folding.ll index 14366923fc4..16d8f97c3a2 100644 --- a/llvm/test/CodeGen/X86/dbg-changes-codegen-branch-folding.ll +++ b/llvm/test/CodeGen/X86/dbg-changes-codegen-branch-folding.ll @@ -160,45 +160,45 @@ attributes #2 = { nounwind readnone } !44 = !{i32 2, !"Dwarf Version", i32 4} !45 = !{i32 2, !"Debug Info Version", i32 2} !46 = !{!"clang version 3.5.0 "} -!47 = !{i32 11, i32 0, !24, null} +!47 = !MDLocation(line: 11, scope: !24) !48 = !{i8* null} -!49 = !{i32 12, i32 0, !24, null} -!50 = !{i32 14, i32 0, !51, null} +!49 = !MDLocation(line: 12, scope: !24) +!50 = !MDLocation(line: 14, scope: !51) !51 = !{!"0xb\0014\000\000", !1, !24} ; [ DW_TAG_lexical_block ] [/tmp/dbginfo/dbg-changes-codegen-branch-folding.cpp] -!52 = !{i32 15, i32 0, !53, null} +!52 = !MDLocation(line: 15, scope: !53) !53 = !{!"0xb\0014\000\000", !1, !51} ; [ DW_TAG_lexical_block ] [/tmp/dbginfo/dbg-changes-codegen-branch-folding.cpp] -!54 = !{i32 16, i32 0, !53, null} -!55 = !{i32 17, i32 0, !24, null} +!54 = !MDLocation(line: 16, scope: !53) +!55 = !MDLocation(line: 17, scope: !24) !56 = !{!"0x101\00this\0016777216\001088", !40, null, !38, !55} ; [ DW_TAG_arg_variable ] [this] [line 0] -!57 = !{i32 0, i32 0, !40, !55} +!57 = !MDLocation(line: 0, scope: !40, inlinedAt: !55) !58 = !{i8* getelementptr inbounds ([1 x i8]* @.str, i64 0, i64 0)} !59 = !{!"0x101\00value\0033554437\000", !40, !25, !15, !55} ; [ DW_TAG_arg_variable ] [value] [line 5] -!60 = !{i32 5, i32 0, !40, !55} -!61 = !{i32 5, i32 0, !62, !55} +!60 = !MDLocation(line: 5, scope: !40, inlinedAt: !55) +!61 = !MDLocation(line: 5, scope: !62, inlinedAt: !55) !62 = !{!"0xb\005\000\000", !1, !40} ; [ DW_TAG_lexical_block ] [/tmp/dbginfo/dbg-changes-codegen-branch-folding.cpp] -!63 = !{i32 18, i32 0, !24, null} +!63 = !MDLocation(line: 18, scope: !24) !64 = !{!"0x101\00this\0016777216\001088", !40, null, !38, !63} ; [ DW_TAG_arg_variable ] [this] [line 0] -!65 = !{i32 0, i32 0, !40, !63} +!65 = !MDLocation(line: 0, scope: !40, inlinedAt: !63) !66 = !{!"0x101\00value\0033554437\000", !40, !25, !15, !63} ; [ DW_TAG_arg_variable ] [value] [line 5] -!67 = !{i32 5, i32 0, !40, !63} -!68 = !{i32 5, i32 0, !62, !63} -!69 = !{i32 20, i32 0, !70, null} +!67 = !MDLocation(line: 5, scope: !40, inlinedAt: !63) +!68 = !MDLocation(line: 5, scope: !62, inlinedAt: !63) +!69 = !MDLocation(line: 20, scope: !70) !70 = !{!"0xb\0020\000\000", !1, !24} ; [ DW_TAG_lexical_block ] [/tmp/dbginfo/dbg-changes-codegen-branch-folding.cpp] !71 = !{!"0x101\00this\0016777216\001088", !35, null, !38, !72} ; [ DW_TAG_arg_variable ] [this] [line 0] -!72 = !{i32 21, i32 0, !70, null} -!73 = !{i32 0, i32 0, !35, !72} +!72 = !MDLocation(line: 21, scope: !70) +!73 = !MDLocation(line: 0, scope: !35, inlinedAt: !72) !74 = !{i8* getelementptr inbounds ([2 x i8]* @.str1, i64 0, i64 0)} !75 = !{!"0x101\00value\0033554438\000", !35, !25, !15, !72} ; [ DW_TAG_arg_variable ] [value] [line 6] -!76 = !{i32 6, i32 0, !35, !72} +!76 = !MDLocation(line: 6, scope: !35, inlinedAt: !72) !77 = !{!"0x101\00this\0016777216\001088", !35, null, !38, !78} ; [ DW_TAG_arg_variable ] [this] [line 0] -!78 = !{i32 23, i32 0, !70, null} -!79 = !{i32 0, i32 0, !35, !78} +!78 = !MDLocation(line: 23, scope: !70) +!79 = !MDLocation(line: 0, scope: !35, inlinedAt: !78) !80 = !{i8* getelementptr inbounds ([2 x i8]* @.str2, i64 0, i64 0)} !81 = !{!"0x101\00value\0033554438\000", !35, !25, !15, !78} ; [ DW_TAG_arg_variable ] [value] [line 6] -!82 = !{i32 6, i32 0, !35, !78} +!82 = !MDLocation(line: 6, scope: !35, inlinedAt: !78) !83 = !{!"0x101\00this\0016777216\001088", !35, null, !38, !84} ; [ DW_TAG_arg_variable ] [this] [line 0] -!84 = !{i32 24, i32 0, !24, null} -!85 = !{i32 0, i32 0, !35, !84} +!84 = !MDLocation(line: 24, scope: !24) +!85 = !MDLocation(line: 0, scope: !35, inlinedAt: !84) !86 = !{!"0x101\00value\0033554438\000", !35, !25, !15, !84} ; [ DW_TAG_arg_variable ] [value] [line 6] -!87 = !{i32 6, i32 0, !35, !84} -!88 = !{i32 25, i32 0, !24, null} +!87 = !MDLocation(line: 6, scope: !35, inlinedAt: !84) +!88 = !MDLocation(line: 25, scope: !24) diff --git a/llvm/test/CodeGen/X86/misched-code-difference-with-debug.ll b/llvm/test/CodeGen/X86/misched-code-difference-with-debug.ll index d44590ff02a..fb2a986e561 100644 --- a/llvm/test/CodeGen/X86/misched-code-difference-with-debug.ll +++ b/llvm/test/CodeGen/X86/misched-code-difference-with-debug.ll @@ -86,5 +86,5 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) !21 = !{!"0x34\00argc\00argc\00\001\000\001", null, !14, !11, i8* @argc, null} ; [ DW_TAG_variable ] [argc] [line 1] [def] !22 = !{i32 2, !"Dwarf Version", i32 4} !23 = !{i32 2, !"Debug Info Version", i32 2} -!25 = !{i32 8, i32 3, !13, null} +!25 = !MDLocation(line: 8, column: 3, scope: !13) !29 = !{!"0x102"} ; [ DW_TAG_expression ] diff --git a/llvm/test/CodeGen/X86/stack-protector-dbginfo.ll b/llvm/test/CodeGen/X86/stack-protector-dbginfo.ll index 1c6c302c7df..a84b77eac5f 100644 --- a/llvm/test/CodeGen/X86/stack-protector-dbginfo.ll +++ b/llvm/test/CodeGen/X86/stack-protector-dbginfo.ll @@ -63,9 +63,9 @@ attributes #0 = { sspreq } !35 = !{!36, !37} !36 = !{!"0x101\00p1\0016777228\000", !24, !10, !29} ; [ DW_TAG_arg_variable ] [p1] [line 12] !37 = !{!"0x101\00p2\0033554444\000", !24, !10, !32} ; [ DW_TAG_arg_variable ] [p2] [line 12] -!38 = !{i32 33, i32 0, !9, null} -!39 = !{i32 12, i32 0, !24, !38} -!40 = !{i32 9, i32 0, !41, !59} +!38 = !MDLocation(line: 33, scope: !9) +!39 = !MDLocation(line: 12, scope: !24, inlinedAt: !38) +!40 = !MDLocation(line: 9, scope: !41, inlinedAt: !59) !41 = !{!"0x2e\00min<unsigned long long, __1::A>\00min<unsigned long long, __1::A>\00_ZN3__13minIyNS_1AEEERKT_S4_RS2_T0_\007\000\001\000\006\00256\001\008", !1, !25, !42, null, null, !53, null, !55} ; [ DW_TAG_subprogram ] [line 7] [def] [scope 8] [min<unsigned long long, __1::A>] !42 = !{!"0x15\00\000\000\000\000\000\000", i32 0, null, null, !43, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ] !43 = !{!29, !29, !32, !44} @@ -84,7 +84,7 @@ attributes #0 = { sspreq } !56 = !{!"0x101\00p1\0016777223\000", !41, !10, !29} ; [ DW_TAG_arg_variable ] [p1] [line 7] !57 = !{!"0x101\00p2\0033554439\000", !41, !10, !32} ; [ DW_TAG_arg_variable ] [p2] [line 7] !58 = !{!"0x101\00p3\0050331656\000", !41, !10, !44} ; [ DW_TAG_arg_variable ] [p3] [line 8] -!59 = !{i32 13, i32 0, !24, !38} +!59 = !MDLocation(line: 13, scope: !24, inlinedAt: !38) !63 = !{i32 undef} !64 = !{!"0x101\00p1\0033554433\000", !65, !10, !50, !40} ; [ DW_TAG_arg_variable ] [p1] [line 1] !65 = !{!"0x2e\00operator()\00operator()\00_ZN3__11AclERKiS2_\001\000\001\000\006\00256\001\002", !1, !25, !47, null, null, null, !46, !66} ; [ DW_TAG_subprogram ] [line 1] [def] [scope 2] [operator()] @@ -93,5 +93,5 @@ attributes #0 = { sspreq } !68 = !{!"0xf\00\000\0064\0064\000\000", null, null, !44} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from A] !69 = !{!"0x101\00p1\0033554433\000", !65, !10, !50} ; [ DW_TAG_arg_variable ] [p1] [line 1] !70 = !{!"0x101\00\0050331650\000", !65, !10, !50} ; [ DW_TAG_arg_variable ] [line 2] -!71 = !{i32 1, i32 0, !65, !40} +!71 = !MDLocation(line: 1, scope: !65, inlinedAt: !40) !72 = !{i32 1, !"Debug Info Version", i32 2} diff --git a/llvm/test/CodeGen/X86/unknown-location.ll b/llvm/test/CodeGen/X86/unknown-location.ll index 55b8a9e66d3..140121ba303 100644 --- a/llvm/test/CodeGen/X86/unknown-location.ll +++ b/llvm/test/CodeGen/X86/unknown-location.ll @@ -29,7 +29,7 @@ entry: !5 = !{!6} !6 = !{!"0x24\00int\000\0032\0032\000\000\005", !10, !2} ; [ DW_TAG_base_type ] !7 = !{!"0xb\001\0030\000", !2, !1} ; [ DW_TAG_lexical_block ] -!8 = !{i32 4, i32 3, !7, null} +!8 = !MDLocation(line: 4, column: 3, scope: !7) !9 = !{!1} !10 = !{!"test.c", !"/dir"} !11 = !{i32 0} diff --git a/llvm/test/CodeGen/XCore/dwarf_debug.ll b/llvm/test/CodeGen/XCore/dwarf_debug.ll index 9be41232827..8c9c47de649 100644 --- a/llvm/test/CodeGen/XCore/dwarf_debug.ll +++ b/llvm/test/CodeGen/XCore/dwarf_debug.ll @@ -35,5 +35,5 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) !9 = !{i32 2, !"Dwarf Version", i32 4} !10 = !{i32 2, !"Debug Info Version", i32 2} !11 = !{!"0x101\00a\0016777218\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] -!12 = !{i32 2, i32 0, !4, null} +!12 = !MDLocation(line: 2, scope: !4) |
