IR: Move MDLocation into place

This commit moves `MDLocation`, finishing off PR21433.  There's an
accompanying clang commit for frontend testcases.  I'll attach the
testcase upgrade script I used to PR21433 to help out-of-tree
frontends/backends.

This changes the schema for `DebugLoc` and `DILocation` from:

    !{i32 3, i32 7, !7, !8}

to:

    !MDLocation(line: 3, column: 7, scope: !7, inlinedAt: !8)

Note that empty fields (line/column: 0 and inlinedAt: null) don't get
printed by the assembly writer.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@226048 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Duncan P. N. Exon Smith
2015-01-14 22:27:36 +00:00
parent de8202b084
commit 37ac8d3622
299 changed files with 1587 additions and 1580 deletions

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)

View File

@@ -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}

View File

@@ -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}

View File

@@ -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)

View File

@@ -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)