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

24 files changed, 80 insertions, 80 deletions

diff --git a/test/Linker/2011-08-04-DebugLoc.ll b/test/Linker/2011-08-04-DebugLoc.ll
index 03e82dc604e..85b9e17c566 100644
--- a/test/Linker/2011-08-04-DebugLoc.ll
+++ b/test/Linker/2011-08-04-DebugLoc.ll
@@ -23,7 +23,7 @@ define i32 @foo() nounwind ssp {
 !3 = !{!"0x15\00\000\000\000\000\000\000", !8, !2, null, !4, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
 !4 = !{!5}
 !5 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !0} ; [ DW_TAG_base_type ]
-!6 = !{i32 2, i32 13, !7, null}
+!6 = !MDLocation(line: 2, column: 13, scope: !7)
 !7 = !{!"0xb\002\0011\000", !8, !1} ; [ DW_TAG_lexical_block ]
 !8 = !{!"a.c", !"/private/tmp"}
 !9 = !{i32 0}
diff --git a/test/Linker/2011-08-04-DebugLoc2.ll b/test/Linker/2011-08-04-DebugLoc2.ll
index a28e1e5a328..a3cd0010092 100644
--- a/test/Linker/2011-08-04-DebugLoc2.ll
+++ b/test/Linker/2011-08-04-DebugLoc2.ll
@@ -20,7 +20,7 @@ define i32 @bar() nounwind ssp {
 !3 = !{!"0x15\00\000\000\000\000\000\000", !8, !2, null, !4, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
 !4 = !{!5}
 !5 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !0} ; [ DW_TAG_base_type ]
-!6 = !{i32 1, i32 13, !7, null}
+!6 = !MDLocation(line: 1, column: 13, scope: !7)
 !7 = !{!"0xb\001\0011\000", !8, !1} ; [ DW_TAG_lexical_block ]
 !8 = !{!"b.c", !"/private/tmp"}
 !9 = !{i32 0}
diff --git a/test/Linker/2011-08-04-Metadata.ll b/test/Linker/2011-08-04-Metadata.ll
index 475facf7bb5..da98f20e3f1 100644
--- a/test/Linker/2011-08-04-Metadata.ll
+++ b/test/Linker/2011-08-04-Metadata.ll
@@ -27,7 +27,7 @@ entry:
 !4 = !{null}
 !5 = !{!"0x34\00x\00x\00\002\001\001", !0, !2, !6, i32* @x} ; [ DW_TAG_variable ]
 !6 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !0} ; [ DW_TAG_base_type ]
-!7 = !{i32 3, i32 14, !8, null}
+!7 = !MDLocation(line: 3, column: 14, scope: !8)
 !8 = !{!"0xb\003\0012\000", !9, !1} ; [ DW_TAG_lexical_block ]
 !9 = !{!"/tmp/one.c", !"/Volumes/Lalgate/Slate/D"}
 !10 = !{!1}
diff --git a/test/Linker/2011-08-04-Metadata2.ll b/test/Linker/2011-08-04-Metadata2.ll
index e9e50e232c1..fb196d96df7 100644
--- a/test/Linker/2011-08-04-Metadata2.ll
+++ b/test/Linker/2011-08-04-Metadata2.ll
@@ -26,7 +26,7 @@ entry:
 !4 = !{null}
 !5 = !{!"0x34\00x\00x\00\001\001\001", !0, !2, !6, i32* @x} ; [ DW_TAG_variable ]
 !6 = !{!"0x24\00int\000\0032\0032\000\000\005", null, !0} ; [ DW_TAG_base_type ]
-!7 = !{i32 2, i32 14, !8, null}
+!7 = !MDLocation(line: 2, column: 14, scope: !8)
 !8 = !{!"0xb\002\0012\000", !9, !1} ; [ DW_TAG_lexical_block ]
 !9 = !{!"/tmp/two.c", !"/Volumes/Lalgate/Slate/D"}
 !10 = !{!1}
diff --git a/test/Linker/2011-08-18-unique-class-type.ll b/test/Linker/2011-08-18-unique-class-type.ll
index bd681a9dac6..a8f13500a75 100644
--- a/test/Linker/2011-08-18-unique-class-type.ll
+++ b/test/Linker/2011-08-18-unique-class-type.ll
@@ -32,8 +32,8 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone
 !10 = !{!"0x2\00A\003\008\008\000\000\000", !17, !11, null, !2, null, null, null} ; [ DW_TAG_class_type ] [A] [line 3, size 8, align 8, offset 0] [def] [from ]
 !11 = !{!"0x39\00N1\002", !17, null} ; [ DW_TAG_namespace ]
 !12 = !{!"0x29", !17} ; [ DW_TAG_file_type ]
-!13 = !{i32 4, i32 12, !5, null}
-!14 = !{i32 4, i32 18, !15, null}
+!13 = !MDLocation(line: 4, column: 12, scope: !5)
+!14 = !MDLocation(line: 4, column: 18, scope: !15)
 !15 = !{!"0xb\004\0017\000", !16, !5} ; [ DW_TAG_lexical_block ]
 !16 = !{!"n1.c", !"/private/tmp"}
 !17 = !{!"./n.h", !"/private/tmp"}
diff --git a/test/Linker/2011-08-18-unique-class-type2.ll b/test/Linker/2011-08-18-unique-class-type2.ll
index 229bf2034d7..dd0df5889ec 100644
--- a/test/Linker/2011-08-18-unique-class-type2.ll
+++ b/test/Linker/2011-08-18-unique-class-type2.ll
@@ -30,8 +30,8 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone
 !10 = !{!"0x2\00A\003\008\008\000\000\000", !17, !11, null, !2, null, null, null} ; [ DW_TAG_class_type ] [A] [line 3, size 8, align 8, offset 0] [def] [from ]
 !11 = !{!"0x39\00N1\002", !17, null} ; [ DW_TAG_namespace ]
 !12 = !{!"0x29", !17} ; [ DW_TAG_file_type ]
-!13 = !{i32 4, i32 12, !5, null}
-!14 = !{i32 4, i32 20, !15, null}
+!13 = !MDLocation(line: 4, column: 12, scope: !5)
+!14 = !MDLocation(line: 4, column: 20, scope: !15)
 !15 = !{!"0xb\004\0019\000", !16, !5} ; [ DW_TAG_lexical_block ]
 !16 = !{!"n2.c", !"/private/tmp"}
 !17 = !{!"./n.h", !"/private/tmp"}
diff --git a/test/Linker/2011-08-18-unique-debug-type.ll b/test/Linker/2011-08-18-unique-debug-type.ll
index e26104736e0..c1b3a1d7939 100644
--- a/test/Linker/2011-08-18-unique-debug-type.ll
+++ b/test/Linker/2011-08-18-unique-debug-type.ll
@@ -21,7 +21,7 @@ entry:
 !7 = !{!"0x15\00\000\000\000\000\000\000", !12, !6, null, !8, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
 !8 = !{!9}
 !9 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ]
-!10 = !{i32 1, i32 13, !11, null}
+!10 = !MDLocation(line: 1, column: 13, scope: !11)
 !11 = !{!"0xb\001\0011\000", !12, !5} ; [ DW_TAG_lexical_block ]
 !12 = !{!"one.c", !"/private/tmp"}
 !13 = !{i32 1, !"Debug Info Version", i32 2}
diff --git a/test/Linker/2011-08-18-unique-debug-type2.ll b/test/Linker/2011-08-18-unique-debug-type2.ll
index 221a9c68f6c..49c0a5cf656 100644
--- a/test/Linker/2011-08-18-unique-debug-type2.ll
+++ b/test/Linker/2011-08-18-unique-debug-type2.ll
@@ -21,7 +21,7 @@ entry:
 !7 = !{!"0x15\00\000\000\000\000\000\000", !12, !6, null, !8, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
 !8 = !{!9}
 !9 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ]
-!10 = !{i32 1, i32 13, !11, null}
+!10 = !MDLocation(line: 1, column: 13, scope: !11)
 !11 = !{!"0xb\001\0011\000", !12, !5} ; [ DW_TAG_lexical_block ]
 !12 = !{!"two.c", !"/private/tmp"}
 !13 = !{i32 1, !"Debug Info Version", i32 2}
diff --git a/test/Linker/DbgDeclare.ll b/test/Linker/DbgDeclare.ll
index 7b52ab59a10..de5ac9e97b2 100644
--- a/test/Linker/DbgDeclare.ll
+++ b/test/Linker/DbgDeclare.ll
@@ -51,10 +51,10 @@ declare void @test(i32, i8**)
 !12 = !{!"0x26\00\000\000\000\000\000", null, null, !13} ; [ DW_TAG_const_type ]
 !13 = !{!"0x24\00char\000\008\008\000\000\006", null, null} ; [ DW_TAG_base_type ]
 !14 = !{!"0x101\00argc\0016777219\000", !5, !6, !9} ; [ DW_TAG_arg_variable ]
-!15 = !{i32 3, i32 0, !5, null}
+!15 = !MDLocation(line: 3, scope: !5)
 !16 = !{!"0x101\00argv\0033554435\000", !5, !6, !10} ; [ DW_TAG_arg_variable ]
-!17 = !{i32 5, i32 0, !18, null}
+!17 = !MDLocation(line: 5, scope: !18)
 !18 = !{!"0xb\004\000\000", !20, !5} ; [ DW_TAG_lexical_block ]
-!19 = !{i32 6, i32 0, !18, null}
+!19 = !MDLocation(line: 6, scope: !18)
 !20 = !{!"main.cpp", !"/private/tmp"}
 !21 = !{i32 1, !"Debug Info Version", i32 2}
diff --git a/test/Linker/DbgDeclare2.ll b/test/Linker/DbgDeclare2.ll
index 29f3ecbdf50..2f01b0eaea2 100644
--- a/test/Linker/DbgDeclare2.ll
+++ b/test/Linker/DbgDeclare2.ll
@@ -64,16 +64,16 @@ declare i32 @puts(i8*)
 !12 = !{!"0x26\00\000\000\000\000\000", null, null, !13} ; [ DW_TAG_const_type ]
 !13 = !{!"0x24\00char\000\008\008\000\000\006", null, null} ; [ DW_TAG_base_type ]
 !14 = !{!"0x101\00argc\0016777220\000", !5, !6, !9} ; [ DW_TAG_arg_variable ]
-!15 = !{i32 4, i32 0, !5, null}
+!15 = !MDLocation(line: 4, scope: !5)
 !16 = !{!"0x101\00argv\0033554436\000", !5, !6, !10} ; [ DW_TAG_arg_variable ]
 !17 = !{!"0x100\00i\006\000", !18, !6, !9} ; [ DW_TAG_auto_variable ]
 !18 = !{!"0xb\006\000\001", !26, !19} ; [ DW_TAG_lexical_block ]
 !19 = !{!"0xb\005\000\000", !26, !5} ; [ DW_TAG_lexical_block ]
-!20 = !{i32 6, i32 0, !18, null}
-!21 = !{i32 8, i32 0, !22, null}
+!20 = !MDLocation(line: 6, scope: !18)
+!21 = !MDLocation(line: 8, scope: !22)
 !22 = !{!"0xb\007\000\002", !26, !18} ; [ DW_TAG_lexical_block ]
-!23 = !{i32 9, i32 0, !22, null}
-!24 = !{i32 10, i32 0, !19, null}
+!23 = !MDLocation(line: 9, scope: !22)
+!24 = !MDLocation(line: 10, scope: !19)
 !25 = !{!"main.cpp", !"/private/tmp"}
 !26 = !{!"test.cpp", !"/private/tmp"}
 !27 = !{i32 1, !"Debug Info Version", i32 2}
diff --git a/test/Linker/Inputs/replaced-function-matches-first-subprogram.ll b/test/Linker/Inputs/replaced-function-matches-first-subprogram.ll
index fb7b634e66a..a5de89f5a60 100644
--- a/test/Linker/Inputs/replaced-function-matches-first-subprogram.ll
+++ b/test/Linker/Inputs/replaced-function-matches-first-subprogram.ll
@@ -24,4 +24,4 @@ entry:
 !9 = !{i32 2, !"Debug Info Version", i32 2}
 !10 = !{i32 1, !"PIC Level", i32 2}
 !11 = !{!"clang version 3.6.0 (trunk 224193) (llvm/trunk 224197)"}
-!12 = !{i32 2, i32 15, !4, null}
+!12 = !MDLocation(line: 2, column: 15, scope: !4)
diff --git a/test/Linker/Inputs/type-unique-inheritance-a.ll b/test/Linker/Inputs/type-unique-inheritance-a.ll
index afa53165fc7..c503919349f 100644
--- a/test/Linker/Inputs/type-unique-inheritance-a.ll
+++ b/test/Linker/Inputs/type-unique-inheritance-a.ll
@@ -87,8 +87,8 @@ attributes #1 = { nounwind readnone }
 !18 = !{null, !12}
 !19 = !{i32 2, !"Dwarf Version", i32 2}
 !20 = !{!"0x101\00a\0016777221\000", !15, !16, !12} ; [ DW_TAG_arg_variable ] [a] [line 5]
-!21 = !{i32 5, i32 0, !15, null}
+!21 = !MDLocation(line: 5, scope: !15)
 !22 = !{!"0x100\00t\006\000", !15, !16, !4} ; [ DW_TAG_auto_variable ] [t] [line 6]
-!23 = !{i32 6, i32 0, !15, null}
-!24 = !{i32 7, i32 0, !15, null}
+!23 = !MDLocation(line: 6, scope: !15)
+!24 = !MDLocation(line: 7, scope: !15)
 !25 = !{i32 1, !"Debug Info Version", i32 2}
diff --git a/test/Linker/Inputs/type-unique-inheritance-b.ll b/test/Linker/Inputs/type-unique-inheritance-b.ll
index 543ce1437ec..d3b9dead03c 100644
--- a/test/Linker/Inputs/type-unique-inheritance-b.ll
+++ b/test/Linker/Inputs/type-unique-inheritance-b.ll
@@ -69,13 +69,13 @@ attributes #3 = { "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "n
 !26 = !{!8}
 !27 = !{i32 2, !"Dwarf Version", i32 2}
 !28 = !{!"0x101\00a\0016777220\000", !20, !21, !8} ; [ DW_TAG_arg_variable ] [a] [line 4]
-!29 = !{i32 4, i32 0, !20, null}
+!29 = !MDLocation(line: 4, scope: !20)
 !30 = !{!"0x100\00t\005\000", !20, !21, !4} ; [ DW_TAG_auto_variable ] [t] [line 5]
-!31 = !{i32 5, i32 0, !20, null}
-!32 = !{i32 6, i32 0, !20, null}
+!31 = !MDLocation(line: 5, scope: !20)
+!32 = !MDLocation(line: 6, scope: !20)
 !33 = !{!"0x100\00a\0010\000", !24, !21, !11} ; [ DW_TAG_auto_variable ] [a] [line 10]
-!34 = !{i32 10, i32 0, !24, null}
-!35 = !{i32 11, i32 0, !24, null}
-!36 = !{i32 12, i32 0, !24, null}
-!37 = !{i32 13, i32 0, !24, null}
+!34 = !MDLocation(line: 10, scope: !24)
+!35 = !MDLocation(line: 11, scope: !24)
+!36 = !MDLocation(line: 12, scope: !24)
+!37 = !MDLocation(line: 13, scope: !24)
 !38 = !{i32 1, !"Debug Info Version", i32 2}
diff --git a/test/Linker/Inputs/type-unique-simple2-a.ll b/test/Linker/Inputs/type-unique-simple2-a.ll
index f500de7e432..6d6e93c68f0 100644
--- a/test/Linker/Inputs/type-unique-simple2-a.ll
+++ b/test/Linker/Inputs/type-unique-simple2-a.ll
@@ -81,8 +81,8 @@ attributes #1 = { nounwind readnone }
 !15 = !{null, !8}
 !16 = !{i32 2, !"Dwarf Version", i32 2}
 !17 = !{!"0x101\00a\0016777219\000", !12, !13, !8} ; [ DW_TAG_arg_variable ] [a] [line 3]
-!18 = !{i32 3, i32 0, !12, null}
+!18 = !MDLocation(line: 3, scope: !12)
 !19 = !{!"0x100\00t\004\000", !12, !13, !4} ; [ DW_TAG_auto_variable ] [t] [line 4]
-!20 = !{i32 4, i32 0, !12, null}
-!21 = !{i32 5, i32 0, !12, null}
+!20 = !MDLocation(line: 4, scope: !12)
+!21 = !MDLocation(line: 5, scope: !12)
 !22 = !{i32 1, !"Debug Info Version", i32 2}
diff --git a/test/Linker/Inputs/type-unique-simple2-b.ll b/test/Linker/Inputs/type-unique-simple2-b.ll
index ee63e863ea2..d3b2f7e514c 100644
--- a/test/Linker/Inputs/type-unique-simple2-b.ll
+++ b/test/Linker/Inputs/type-unique-simple2-b.ll
@@ -57,11 +57,11 @@ attributes #3 = { "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "n
 !18 = !{!8}
 !19 = !{i32 2, !"Dwarf Version", i32 2}
 !20 = !{!"0x101\00a\0016777220\000", !12, !13, !8} ; [ DW_TAG_arg_variable ] [a] [line 4]
-!21 = !{i32 4, i32 0, !12, null}
+!21 = !MDLocation(line: 4, scope: !12)
 !22 = !{!"0x100\00t\005\000", !12, !13, !4} ; [ DW_TAG_auto_variable ] [t] [line 5]
-!23 = !{i32 5, i32 0, !12, null}
-!24 = !{i32 6, i32 0, !12, null}
-!25 = !{i32 8, i32 0, !16, null}
-!26 = !{i32 9, i32 0, !16, null}
-!27 = !{i32 10, i32 0, !16, null}
+!23 = !MDLocation(line: 5, scope: !12)
+!24 = !MDLocation(line: 6, scope: !12)
+!25 = !MDLocation(line: 8, scope: !16)
+!26 = !MDLocation(line: 9, scope: !16)
+!27 = !MDLocation(line: 10, scope: !16)
 !28 = !{i32 1, !"Debug Info Version", i32 2}
diff --git a/test/Linker/replaced-function-matches-first-subprogram.ll b/test/Linker/replaced-function-matches-first-subprogram.ll
index 65113844c16..c0ec5f3cd22 100644
--- a/test/Linker/replaced-function-matches-first-subprogram.ll
+++ b/test/Linker/replaced-function-matches-first-subprogram.ll
@@ -68,8 +68,8 @@ entry:
 !11 = !{i32 2, !"Debug Info Version", i32 2}
 !12 = !{i32 1, !"PIC Level", i32 2}
 !13 = !{!"clang version 3.6.0 (trunk 224193) (llvm/trunk 224197)"}
-!14 = !{i32 2, i32 20, !4, null}
+!14 = !MDLocation(line: 2, column: 20, scope: !4)
 
 ; The same subprogram should be pointed to by inside the !dbg reference.
-; CHECK: ![[LOC]] = !{i32 2, i32 15, ![[SP2]], null}
-!15 = !{i32 2, i32 15, !7, null}
+; CHECK: ![[LOC]] = !MDLocation(line: 2, column: 15, scope: ![[SP2]])
+!15 = !MDLocation(line: 2, column: 15, scope: !7)
diff --git a/test/Linker/type-unique-odr-a.ll b/test/Linker/type-unique-odr-a.ll
index 8cf1dd5a32a..900b0359264 100644
--- a/test/Linker/type-unique-odr-a.ll
+++ b/test/Linker/type-unique-odr-a.ll
@@ -96,7 +96,7 @@ attributes #1 = { nounwind readnone }
 !20 = !{i32 2, !"Dwarf Version", i32 4}
 !21 = !{i32 1, !"Debug Info Version", i32 2}
 !22 = !{!"clang version 3.5.0 "}
-!23 = !{i32 11, i32 0, !15, null}
+!23 = !MDLocation(line: 11, scope: !15)
 !24 = !{!"0x100\00a\008\000", !19, !16, !"_ZTS1A"} ; [ DW_TAG_auto_variable ] [a] [line 8]
-!25 = !{i32 8, i32 0, !19, null}
-!26 = !{i32 9, i32 0, !19, null}
+!25 = !MDLocation(line: 8, scope: !19)
+!26 = !MDLocation(line: 9, scope: !19)
diff --git a/test/Linker/type-unique-odr-b.ll b/test/Linker/type-unique-odr-b.ll
index c08a1716dc6..b262191b91f 100644
--- a/test/Linker/type-unique-odr-b.ll
+++ b/test/Linker/type-unique-odr-b.ll
@@ -80,7 +80,7 @@ attributes #1 = { nounwind readnone }
 !23 = !{!"clang version 3.5.0 "}
 !24 = !{!"0x101\00this\0016777216\001088", !15, null, !25} ; [ DW_TAG_arg_variable ] [this] [line 0]
 !25 = !{!"0xf\00\000\0064\0064\000\000", null, null, !"_ZTS1A"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS1A]
-!26 = !{i32 0, i32 0, !15, null}
-!27 = !{i32 8, i32 0, !15, null}
-!28 = !{i32 11, i32 0, !16, null}
-!29 = !{i32 10, i32 0, !20, null}
+!26 = !MDLocation(line: 0, scope: !15)
+!27 = !MDLocation(line: 8, scope: !15)
+!28 = !MDLocation(line: 11, scope: !16)
+!29 = !MDLocation(line: 10, scope: !20)
diff --git a/test/Linker/type-unique-simple-a.ll b/test/Linker/type-unique-simple-a.ll
index 2e48035a350..ef29cd9781d 100644
--- a/test/Linker/type-unique-simple-a.ll
+++ b/test/Linker/type-unique-simple-a.ll
@@ -84,8 +84,8 @@ attributes #1 = { nounwind readnone }
 !13 = !{null, !8}
 !14 = !{i32 2, !"Dwarf Version", i32 2}
 !15 = !{!"0x101\00a\0016777219\000", !10, !11, !8} ; [ DW_TAG_arg_variable ] [a] [line 3]
-!16 = !{i32 3, i32 0, !10, null}
+!16 = !MDLocation(line: 3, scope: !10)
 !17 = !{!"0x100\00t\004\000", !10, !11, !4} ; [ DW_TAG_auto_variable ] [t] [line 4]
-!18 = !{i32 4, i32 0, !10, null}
-!19 = !{i32 5, i32 0, !10, null}
+!18 = !MDLocation(line: 4, scope: !10)
+!19 = !MDLocation(line: 5, scope: !10)
 !20 = !{i32 1, !"Debug Info Version", i32 2}
diff --git a/test/Linker/type-unique-simple-b.ll b/test/Linker/type-unique-simple-b.ll
index 743d88a86f4..fb1a5292975 100644
--- a/test/Linker/type-unique-simple-b.ll
+++ b/test/Linker/type-unique-simple-b.ll
@@ -57,11 +57,11 @@ attributes #3 = { "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "n
 !16 = !{!8}
 !17 = !{i32 2, !"Dwarf Version", i32 2}
 !18 = !{!"0x101\00a\0016777220\000", !10, !11, !8} ; [ DW_TAG_arg_variable ] [a] [line 4]
-!19 = !{i32 4, i32 0, !10, null}
+!19 = !MDLocation(line: 4, scope: !10)
 !20 = !{!"0x100\00t\005\000", !10, !11, !4} ; [ DW_TAG_auto_variable ] [t] [line 5]
-!21 = !{i32 5, i32 0, !10, null}
-!22 = !{i32 6, i32 0, !10, null}
-!23 = !{i32 8, i32 0, !14, null}
-!24 = !{i32 9, i32 0, !14, null}
-!25 = !{i32 10, i32 0, !14, null}
+!21 = !MDLocation(line: 5, scope: !10)
+!22 = !MDLocation(line: 6, scope: !10)
+!23 = !MDLocation(line: 8, scope: !14)
+!24 = !MDLocation(line: 9, scope: !14)
+!25 = !MDLocation(line: 10, scope: !14)
 !26 = !{i32 1, !"Debug Info Version", i32 2}
diff --git a/test/Linker/type-unique-simple2-a.ll b/test/Linker/type-unique-simple2-a.ll
index d4f115fbe81..72a776bba0c 100644
--- a/test/Linker/type-unique-simple2-a.ll
+++ b/test/Linker/type-unique-simple2-a.ll
@@ -118,12 +118,12 @@ attributes #4 = { nounwind readnone }
 !35 = !{i32 2, !"Dwarf Version", i32 2}
 !36 = !{i32 1, !"Debug Info Version", i32 2}
 !37 = !{!"clang version 3.5 "}
-!38 = !{i32 3, i32 0, !27, null}
+!38 = !MDLocation(line: 3, scope: !27)
 !39 = !{!"0x101\00this\0016777216\001088", !31, null, !40} ; [ DW_TAG_arg_variable ] [this] [line 0]
 !40 = !{!"0xf\00\000\0064\0064\000\000", null, null, !"_ZTS1A"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS1A]
-!41 = !{i32 0, i32 0, !31, null}
-!42 = !{i32 2, i32 0, !43, null}
+!41 = !MDLocation(line: 0, scope: !31)
+!42 = !MDLocation(line: 2, scope: !43)
 !43 = !{!"0xb\000", !5, !31} ; [ DW_TAG_lexical_block ] [/./ab.h]
 !44 = !{!"0x101\00this\0016777216\001088", !34, null, !40} ; [ DW_TAG_arg_variable ] [this] [line 0]
-!45 = !{i32 0, i32 0, !34, null}
-!46 = !{i32 2, i32 0, !34, null}
+!45 = !MDLocation(line: 0, scope: !34)
+!46 = !MDLocation(line: 2, scope: !34)
diff --git a/test/Linker/type-unique-simple2-b.ll b/test/Linker/type-unique-simple2-b.ll
index 0df62754a1d..25e67d424ea 100644
--- a/test/Linker/type-unique-simple2-b.ll
+++ b/test/Linker/type-unique-simple2-b.ll
@@ -81,8 +81,8 @@ attributes #1 = { nounwind readnone }
 !31 = !{!"clang version 3.5 "}
 !32 = !{!"0x101\00this\0016777216\001088", !26, null, !33} ; [ DW_TAG_arg_variable ] [this] [line 0]
 !33 = !{!"0xf\00\000\0064\0064\000\000", null, null, !"_ZTS1A"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS1A]
-!34 = !{i32 0, i32 0, !26, null}
-!35 = !{i32 2, i32 0, !26, null}
+!34 = !MDLocation(line: 0, scope: !26)
+!35 = !MDLocation(line: 2, scope: !26)
 !36 = !{!"0x101\00this\0016777216\001088", !28, null, !33} ; [ DW_TAG_arg_variable ] [this] [line 0]
-!37 = !{i32 0, i32 0, !28, null}
-!38 = !{i32 4, i32 0, !28, null}
+!37 = !MDLocation(line: 0, scope: !28)
+!38 = !MDLocation(line: 4, scope: !28)
diff --git a/test/Linker/type-unique-type-array-a.ll b/test/Linker/type-unique-type-array-a.ll
index 7f4b5bfcb94..9e2de8821b4 100644
--- a/test/Linker/type-unique-type-array-a.ll
+++ b/test/Linker/type-unique-type-array-a.ll
@@ -117,13 +117,13 @@ attributes #3 = { nounwind }
 !22 = !{i32 2, !"Debug Info Version", i32 2}
 !23 = !{!"clang version 3.5.0 (trunk 214102:214113M) (llvm/trunk 214102:214115M)"}
 !24 = !{!"0x101\00a\0016777227\000", !15, !16, !19} ; [ DW_TAG_arg_variable ] [a] [line 11]
-!25 = !{i32 11, i32 14, !15, null}
+!25 = !MDLocation(line: 11, column: 14, scope: !15)
 !26 = !{!"0x101\00sa\0033554443\000", !15, !16, !"_ZTS2SA"} ; [ DW_TAG_arg_variable ] [sa] [line 11]
-!27 = !{i32 11, i32 20, !15, null}
-!28 = !{i32 12, i32 3, !15, null}
-!29 = !{i32 13, i32 1, !15, null}
+!27 = !MDLocation(line: 11, column: 20, scope: !15)
+!28 = !MDLocation(line: 12, column: 3, scope: !15)
+!29 = !MDLocation(line: 13, column: 1, scope: !15)
 !30 = !{!"0x101\00this\0016777216\001088", !20, null, !19} ; [ DW_TAG_arg_variable ] [this] [line 0]
-!31 = !{i32 0, i32 0, !20, null}
+!31 = !MDLocation(line: 0, scope: !20)
 !32 = !{!"0x101\00a\0033554439\000", !20, !16, !"_ZTS2SA"} ; [ DW_TAG_arg_variable ] [a] [line 7]
-!33 = !{i32 7, i32 17, !20, null}
-!34 = !{i32 8, i32 3, !20, null}
+!33 = !MDLocation(line: 7, column: 17, scope: !20)
+!34 = !MDLocation(line: 8, column: 3, scope: !20)
diff --git a/test/Linker/type-unique-type-array-b.ll b/test/Linker/type-unique-type-array-b.ll
index 45cddb78e45..0fdae2abfe9 100644
--- a/test/Linker/type-unique-type-array-b.ll
+++ b/test/Linker/type-unique-type-array-b.ll
@@ -96,13 +96,13 @@ attributes #3 = { nounwind }
 !22 = !{i32 2, !"Debug Info Version", i32 2}
 !23 = !{!"clang version 3.5.0 (trunk 214102:214113M) (llvm/trunk 214102:214115M)"}
 !24 = !{!"0x101\00b\0016777227\000", !15, !16, !19} ; [ DW_TAG_arg_variable ] [b] [line 11]
-!25 = !{i32 11, i32 14, !15, null}
+!25 = !MDLocation(line: 11, column: 14, scope: !15)
 !26 = !{!"0x101\00sa\0033554443\000", !15, !16, !"_ZTS2SA"} ; [ DW_TAG_arg_variable ] [sa] [line 11]
-!27 = !{i32 11, i32 20, !15, null}
-!28 = !{i32 12, i32 3, !15, null}
-!29 = !{i32 13, i32 1, !15, null}
+!27 = !MDLocation(line: 11, column: 20, scope: !15)
+!28 = !MDLocation(line: 12, column: 3, scope: !15)
+!29 = !MDLocation(line: 13, column: 1, scope: !15)
 !30 = !{!"0x101\00this\0016777216\001088", !20, null, !19} ; [ DW_TAG_arg_variable ] [this] [line 0]
-!31 = !{i32 0, i32 0, !20, null}
+!31 = !MDLocation(line: 0, scope: !20)
 !32 = !{!"0x101\00sa\0033554439\000", !20, !16, !"_ZTS2SA"} ; [ DW_TAG_arg_variable ] [sa] [line 7]
-!33 = !{i32 7, i32 17, !20, null}
-!34 = !{i32 8, i32 3, !20, null}
+!33 = !MDLocation(line: 7, column: 17, scope: !20)
+!34 = !MDLocation(line: 8, column: 3, scope: !20)