Adjust to the new explicit debug metadata

This fixes the outfall of r226048

[Cherry-picked r226134]

git-svn-id: https://llvm.org/svn/llvm-project/polly/branches/release_36@228338 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Isl/CodeGen/LoopParallelMD/do_not_mutate_debug_info.ll b/test/Isl/CodeGen/LoopParallelMD/do_not_mutate_debug_info.ll
index c428093..f3b3551 100644
--- a/test/Isl/CodeGen/LoopParallelMD/do_not_mutate_debug_info.ll
+++ b/test/Isl/CodeGen/LoopParallelMD/do_not_mutate_debug_info.ll
@@ -56,16 +56,16 @@
 !17 = !{!"clang version 3.6.0 "}
 !18 = !{i32 0}
 !19 = !{!"0x102"}               ; [ DW_TAG_expression ]
-!20 = !{i32 4, i32 12, !10, null}
-!21 = !{i32 5, i32 5, !22, null}
+!20 = !MDLocation(line: 4, column: 12, scope: !10)
+!21 = !MDLocation(line: 5, column: 5, scope: !22)
 !22 = !{!"0xb\004\003\001", !1, !10} ; [ DW_TAG_lexical_block ] [/local/mnt/workspace/build/tip-Release/t2.c]
 !23 = !{!24, !24, i64 0}
 !24 = !{!"any pointer", !25, i64 0}
 !25 = !{!"omnipotent char", !26, i64 0}
 !26 = !{!"Simple C/C++ TBAA"}
-!27 = !{i32 4, i32 3, !28, null}
+!27 = !MDLocation(line: 4, column: 3, scope: !28)
 !28 = !{!"0xb\002", !1, !29} ; [ DW_TAG_lexical_block ] [/local/mnt/workspace/build/tip-Release/t2.c]
 !29 = !{!"0xb\001", !1, !22} ; [ DW_TAG_lexical_block ] [/local/mnt/workspace/build/tip-Release/t2.c]
 !30 = !{!31, !31, i64 0}
 !31 = !{!"int", !25, i64 0}
-!32 = !{i32 6, i32 1, !4, null}
+!32 = !MDLocation(line: 6, column: 1, scope: !4)
diff --git a/test/Isl/CodeGen/debug-intrinsics.ll b/test/Isl/CodeGen/debug-intrinsics.ll
index 512a0c1..53c48ef 100644
--- a/test/Isl/CodeGen/debug-intrinsics.ll
+++ b/test/Isl/CodeGen/debug-intrinsics.ll
@@ -70,11 +70,11 @@
 !12 = !{i32 1, !"Debug Info Version", i32 2}
 !13 = !{!"clang version 3.5 "}
 !14 = !{!"0x101\00A\0016777217\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [A] [line 1]
-!15 = !{i32 1, i32 0, !4, null}
+!15 = !MDLocation(line: 1, scope: !4)
 !16 = !{!"0x101\00N\0033554433\000", !4, !5, !10} ; [ DW_TAG_arg_variable ] [N] [line 1]
 !17 = !{i64 0}
 !18 = !{!"0x100\00i\002\000", !19, !5, !10} ; [ DW_TAG_auto_variable ] [i] [line 2]
 !19 = !{!"0xb\002\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [/home/grosser/Projects/polly/git/tools/polly/loop.c]
-!20 = !{i32 2, i32 0, !19, null}
-!21 = !{i32 3, i32 0, !19, null}
-!22 = !{i32 4, i32 0, !4, null}
+!20 = !MDLocation(line: 2, scope: !19)
+!21 = !MDLocation(line: 3, scope: !19)
+!22 = !MDLocation(line: 4, scope: !4)
diff --git a/test/ScopDetect/report-scop-location.ll b/test/ScopDetect/report-scop-location.ll
index 1cfb73e..5c5bfda 100644
--- a/test/ScopDetect/report-scop-location.ll
+++ b/test/ScopDetect/report-scop-location.ll
@@ -71,12 +71,12 @@
 !8 = !{i32 2, !"Dwarf Version", i32 4}
 !9 = !{i32 1, !"Debug Info Version", i32 2}
 !10 = !{!"clang version 3.5 "}
-!11 = !{i32 2, i32 0, !12, null}
+!11 = !MDLocation(line: 2, scope: !12)
 !12 = !{!"0xb\002\000\000", !1, !4} ; [ DW_TAG_lexical_block ] [/home/grosser/Projects/polly/git/tools/polly/test.c]
-!13 = !{i32 3, i32 0, !12, null}
-!14 = !{i32 4, i32 0, !4, null}
-!15 = !{i32 9, i32 0, !16, null}
+!13 = !MDLocation(line: 3, scope: !12)
+!14 = !MDLocation(line: 4, scope: !4)
+!15 = !MDLocation(line: 9, scope: !16)
 !16 = !{!"0xb\009\000\001", !1, !7} ; [ DW_TAG_lexical_block ] [/home/grosser/Projects/polly/git/tools/polly/test.c]
-!17 = !{i32 13, i32 0, !16, null}
-!18 = !{i32 14, i32 0, !7, null}
+!17 = !MDLocation(line: 13, scope: !16)
+!18 = !MDLocation(line: 14, scope: !7)
 
diff --git a/test/ScopDetectionDiagnostics/ReportAlias-01.ll b/test/ScopDetectionDiagnostics/ReportAlias-01.ll
index 36d2166..ad65128 100644
--- a/test/ScopDetectionDiagnostics/ReportAlias-01.ll
+++ b/test/ScopDetectionDiagnostics/ReportAlias-01.ll
@@ -58,13 +58,13 @@
 !11 = !{i32 2, !"Debug Info Version", i32 2}
 !12 = !{!"clang version 3.6.0 "}
 !13 = !{!"0x101\00A\0016777217\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [A] [line 1]
-!14 = !{i32 1, i32 12, !4, null}
+!14 = !MDLocation(line: 1, column: 12, scope: !4)
 !15 = !{!"0x101\00B\0033554433\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [B] [line 1]
-!16 = !{i32 1, i32 21, !4, null}
+!16 = !MDLocation(line: 1, column: 21, scope: !4)
 !17 = !{i32 0}
 !18 = !{!"0x100\00i\002\000", !19, !5, !9} ; [ DW_TAG_auto_variable ] [i] [line 2]
 !19 = !{!"0xb\002\003\000", !1, !4} ; [ DW_TAG_lexical_block ] [test/ScopDetectionDiagnostic/ReportAlias-01.c]
-!20 = !{i32 2, i32 12, !19, null}
-!21 = !{i32 2, i32 8, !19, null}
-!22 = !{i32 3, i32 5, !19, null}
-!23 = !{i32 4, i32 1, !4, null}
+!20 = !MDLocation(line: 2, column: 12, scope: !19)
+!21 = !MDLocation(line: 2, column: 8, scope: !19)
+!22 = !MDLocation(line: 3, column: 5, scope: !19)
+!23 = !MDLocation(line: 4, column: 1, scope: !4)
diff --git a/test/ScopDetectionDiagnostics/ReportDifferentElementSize.ll b/test/ScopDetectionDiagnostics/ReportDifferentElementSize.ll
index 8af4b25..040e343 100644
--- a/test/ScopDetectionDiagnostics/ReportDifferentElementSize.ll
+++ b/test/ScopDetectionDiagnostics/ReportDifferentElementSize.ll
@@ -49,19 +49,19 @@
 !7 = !{i32 2, !"Dwarf Version", i32 4}
 !8 = !{i32 2, !"Debug Info Version", i32 2}
 !9 = !{!"clang version 3.6.0 "}
-!10 = !{i32 3, i32 20, !11, null}
+!10 = !MDLocation(line: 3, column: 20, scope: !11)
 !11 = !{!"0xb\002", !1, !12} ; [ DW_TAG_lexical_block ] [/home/grosser/Projects/polly/git/tools/polly/test/ScopDetectionDiagnostics//tmp/test.c]
 !12 = !{!"0xb\001", !1, !13} ; [ DW_TAG_lexical_block ] [/home/grosser/Projects/polly/git/tools/polly/test/ScopDetectionDiagnostics//tmp/test.c]
 !13 = !{!"0xb\003\003\001", !1, !14} ; [ DW_TAG_lexical_block ] [/home/grosser/Projects/polly/git/tools/polly/test/ScopDetectionDiagnostics//tmp/test.c]
 !14 = !{!"0xb\003\003\000", !1, !4} ; [ DW_TAG_lexical_block ] [/home/grosser/Projects/polly/git/tools/polly/test/ScopDetectionDiagnostics//tmp/test.c]
-!15 = !{i32 4, i32 32, !13, null}
-!16 = !{i32 4, i32 22, !13, null}
-!17 = !{i32 4, i32 14, !13, null}
+!15 = !MDLocation(line: 4, column: 32, scope: !13)
+!16 = !MDLocation(line: 4, column: 22, scope: !13)
+!17 = !MDLocation(line: 4, column: 14, scope: !13)
 !18 = !{!19, !19, i64 0}
 !19 = !{!"double", !20, i64 0}
 !20 = !{!"omnipotent char", !21, i64 0}
 !21 = !{!"Simple C/C++ TBAA"}
 !22 = !{!23, !23, i64 0}
 !23 = !{!"float", !20, i64 0}
-!24 = !{i32 3, i32 30, !13, null}
-!25 = !{i32 5, i32 1, !4, null}
+!24 = !MDLocation(line: 3, column: 30, scope: !13)
+!25 = !MDLocation(line: 5, column: 1, scope: !4)
diff --git a/test/ScopDetectionDiagnostics/ReportFuncCall-01.ll b/test/ScopDetectionDiagnostics/ReportFuncCall-01.ll
index dae4376..823c487 100644
--- a/test/ScopDetectionDiagnostics/ReportFuncCall-01.ll
+++ b/test/ScopDetectionDiagnostics/ReportFuncCall-01.ll
@@ -56,12 +56,12 @@
 !7 = !{i32 2, !"Dwarf Version", i32 4}
 !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 ] [/home/simbuerg/Projekte/llvm/tools/polly/test/ScopDetectionDiagnostics/ReportFuncCall.c]
-!12 = !{i32 5, i32 12, !13, null}
+!12 = !MDLocation(line: 5, column: 12, scope: !13)
 !13 = !{!"0xb\004\0027\000", !1, !11} ; [ DW_TAG_lexical_block ] [/home/simbuerg/Projekte/llvm/tools/polly/test/ScopDetectionDiagnostics/ReportFuncCall.c]
 !14 = !{!15, !15, i64 0}
 !15 = !{!"double", !16, i64 0}
 !16 = !{!"omnipotent char", !17, i64 0}
 !17 = !{!"Simple C/C++ TBAA"}
-!18 = !{i32 7, i32 1, !4, null}
+!18 = !MDLocation(line: 7, column: 1, scope: !4)
diff --git a/test/ScopDetectionDiagnostics/ReportLoopBound-01.ll b/test/ScopDetectionDiagnostics/ReportLoopBound-01.ll
index 91ab928..1d24864 100644
--- a/test/ScopDetectionDiagnostics/ReportLoopBound-01.ll
+++ b/test/ScopDetectionDiagnostics/ReportLoopBound-01.ll
@@ -73,17 +73,17 @@
 !11 = !{i32 2, !"Debug Info Version", i32 2}
 !12 = !{!"clang version 3.6.0 "}
 !13 = !{!"0x101\00A\0016777217\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [A] [line 1]
-!14 = !{i32 1, i32 12, !4, null}
+!14 = !MDLocation(line: 1, column: 12, scope: !4)
 !15 = !{!"0x101\00n\0033554433\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [n] [line 1]
-!16 = !{i32 1, i32 21, !4, null}
+!16 = !MDLocation(line: 1, column: 21, scope: !4)
 !17 = !{i32 0}
 !18 = !{!"0x100\00i\002\000", !19, !5, !9} ; [ DW_TAG_auto_variable ] [i] [line 2]
 !19 = !{!"0xb\002\003\000", !1, !4} ; [ DW_TAG_lexical_block ] [test/ScopDetectionDiagnostic/ReportLoopBound-01.c]
-!20 = !{i32 2, i32 12, !19, null}
-!21 = !{i32 2, i32 8, !19, null}
-!22 = !{i32 2, i32 8, !23, null}
+!20 = !MDLocation(line: 2, column: 12, scope: !19)
+!21 = !MDLocation(line: 2, column: 8, scope: !19)
+!22 = !MDLocation(line: 2, column: 8, scope: !23)
 !23 = !{!"0xb\002\008\001", !1, !19} ; [ DW_TAG_lexical_block ] [test/ScopDetectionDiagnostic/ReportLoopBound-01.c]
-!24 = !{i32 3, i32 5, !19, null}
-!25 = !{i32 2, i32 8, !26, null}
+!24 = !MDLocation(line: 3, column: 5, scope: !19)
+!25 = !MDLocation(line: 2, column: 8, scope: !26)
 !26 = !{!"0xb\002\008\002", !1, !19} ; [ DW_TAG_lexical_block ] [test/ScopDetectionDiagnostic/ReportLoopBound-01.c]
-!27 = !{i32 4, i32 1, !4, null}
+!27 = !MDLocation(line: 4, column: 1, scope: !4)
diff --git a/test/ScopDetectionDiagnostics/ReportMultipleNonAffineAccesses.ll b/test/ScopDetectionDiagnostics/ReportMultipleNonAffineAccesses.ll
index 24267c5..4e6727e 100644
--- a/test/ScopDetectionDiagnostics/ReportMultipleNonAffineAccesses.ll
+++ b/test/ScopDetectionDiagnostics/ReportMultipleNonAffineAccesses.ll
@@ -123,32 +123,32 @@
 !7 = !{i32 2, !"Dwarf Version", i32 4}
 !8 = !{i32 2, !"Debug Info Version", i32 2}
 !9 = !{!"clang version 3.6.0 "}
-!10 = !{i32 3, i32 20, !11, null}
+!10 = !MDLocation(line: 3, column: 20, scope: !11)
 !11 = !{!"0xb\002", !1, !12} ; [ DW_TAG_lexical_block ] [/home/grosser/Projects/polly/git/tools/polly/test//tmp/test.c]
 !12 = !{!"0xb\001", !1, !13} ; [ DW_TAG_lexical_block ] [/home/grosser/Projects/polly/git/tools/polly/test//tmp/test.c]
 !13 = !{!"0xb\003\003\001", !1, !14} ; [ DW_TAG_lexical_block ] [/home/grosser/Projects/polly/git/tools/polly/test//tmp/test.c]
 !14 = !{!"0xb\003\003\000", !1, !4} ; [ DW_TAG_lexical_block ] [/home/grosser/Projects/polly/git/tools/polly/test//tmp/test.c]
-!15 = !{i32 8, i32 16, !16, null}
+!15 = !MDLocation(line: 8, column: 16, scope: !16)
 !16 = !{!"0xb\003\0035\002", !1, !13} ; [ DW_TAG_lexical_block ] [/home/grosser/Projects/polly/git/tools/polly/test//tmp/test.c]
-!17 = !{i32 4, i32 26, !16, null}
-!18 = !{i32 4, i32 22, !16, null}
-!19 = !{i32 7, i32 16, !16, null}
-!20 = !{i32 9, i32 16, !16, null}
-!21 = !{i32 10, i32 16, !16, null}
-!22 = !{i32 4, i32 16, !16, null}
-!27 = !{i32 5, i32 26, !16, null}
-!28 = !{i32 5, i32 16, !16, null}
-!29 = !{i32 6, i32 16, !16, null}
-!30 = !{i32 11, i32 23, !16, null} ; [ DW_TAG_lexical_block ] [/]
-!31 = !{i32 11, i32 16, !16, null} ; [ DW_TAG_lexical_block ] [/]
-!32 = !{i32 13, i32 21, !16, null}
-!33 = !{i32 13, i32 26, !16, null}
-!34 = !{i32 13, i32 31, !16, null}
-!35 = !{i32 13, i32 36, !16, null}
-!36 = !{i32 13, i32 41, !16, null}
-!37 = !{i32 13, i32 46, !16, null}
-!38 = !{i32 13, i32 51, !16, null}
-!39 = !{i32 13, i32 11, !16, null}
-!40 = !{i32 13, i32 5, !16, null}
-!41 = !{i32 3, i32 30, !13, null}
-!42 = !{i32 15, i32 1, !4, null}
+!17 = !MDLocation(line: 4, column: 26, scope: !16)
+!18 = !MDLocation(line: 4, column: 22, scope: !16)
+!19 = !MDLocation(line: 7, column: 16, scope: !16)
+!20 = !MDLocation(line: 9, column: 16, scope: !16)
+!21 = !MDLocation(line: 10, column: 16, scope: !16)
+!22 = !MDLocation(line: 4, column: 16, scope: !16)
+!27 = !MDLocation(line: 5, column: 26, scope: !16)
+!28 = !MDLocation(line: 5, column: 16, scope: !16)
+!29 = !MDLocation(line: 6, column: 16, scope: !16)
+!30 = !MDLocation(line: 11, column: 23, scope: !16) ; [ DW_TAG_lexical_block ] [/]
+!31 = !MDLocation(line: 11, column: 16, scope: !16) ; [ DW_TAG_lexical_block ] [/]
+!32 = !MDLocation(line: 13, column: 21, scope: !16)
+!33 = !MDLocation(line: 13, column: 26, scope: !16)
+!34 = !MDLocation(line: 13, column: 31, scope: !16)
+!35 = !MDLocation(line: 13, column: 36, scope: !16)
+!36 = !MDLocation(line: 13, column: 41, scope: !16)
+!37 = !MDLocation(line: 13, column: 46, scope: !16)
+!38 = !MDLocation(line: 13, column: 51, scope: !16)
+!39 = !MDLocation(line: 13, column: 11, scope: !16)
+!40 = !MDLocation(line: 13, column: 5, scope: !16)
+!41 = !MDLocation(line: 3, column: 30, scope: !13)
+!42 = !MDLocation(line: 15, column: 1, scope: !4)
diff --git a/test/ScopDetectionDiagnostics/ReportNonAffineAccess-01.ll b/test/ScopDetectionDiagnostics/ReportNonAffineAccess-01.ll
index 70b614f..dab633b 100644
--- a/test/ScopDetectionDiagnostics/ReportNonAffineAccess-01.ll
+++ b/test/ScopDetectionDiagnostics/ReportNonAffineAccess-01.ll
@@ -62,12 +62,12 @@
 !11 = !{i32 2, !"Debug Info Version", i32 2}
 !12 = !{!"clang version 3.6.0 "}
 !13 = !{!"0x101\00A\0016777217\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [A] [line 1]
-!14 = !{i32 1, i32 12, !4, null}
+!14 = !MDLocation(line: 1, column: 12, scope: !4)
 !15 = !{i32 0}
 !16 = !{!"0x100\00i\002\000", !17, !5, !9} ; [ DW_TAG_auto_variable ] [i] [line 2]
 !17 = !{!"0xb\002\003\000", !1, !4} ; [ DW_TAG_lexical_block ] [test/ScopDetectionDiagnostic/ReportNonAffineAccess-01.c]
-!18 = !{i32 2, i32 11, !17, null}
-!19 = !{i32 2, i32 7, !17, null}
-!20 = !{i32 3, i32 5, !17, null}
-!21 = !{i32 2, i32 22, !17, null}
-!22 = !{i32 4, i32 1, !4, null}
+!18 = !MDLocation(line: 2, column: 11, scope: !17)
+!19 = !MDLocation(line: 2, column: 7, scope: !17)
+!20 = !MDLocation(line: 3, column: 5, scope: !17)
+!21 = !MDLocation(line: 2, column: 22, scope: !17)
+!22 = !MDLocation(line: 4, column: 1, scope: !4)
diff --git a/test/ScopDetectionDiagnostics/ReportVariantBasePtr-01.ll b/test/ScopDetectionDiagnostics/ReportVariantBasePtr-01.ll
index c24bf75..eb6cd8b 100644
--- a/test/ScopDetectionDiagnostics/ReportVariantBasePtr-01.ll
+++ b/test/ScopDetectionDiagnostics/ReportVariantBasePtr-01.ll
@@ -85,15 +85,15 @@
 !20 = !{i32 2, !"Dwarf Version", i32 4}
 !21 = !{i32 2, !"Debug Info Version", i32 2}
 !22 = !{!"clang version 3.5.0 "}
-!23 = !{i32 5, i32 18, !4, null}
+!23 = !MDLocation(line: 5, column: 18, scope: !4)
 !24 = !{i32 0}
-!25 = !{i32 6, i32 12, !18, null}
-!26 = !{i32 7, i32 5, !18, null}
-!27 = !{i32 6, i32 8, !18, null}
+!25 = !MDLocation(line: 6, column: 12, scope: !18)
+!26 = !MDLocation(line: 7, column: 5, scope: !18)
+!27 = !MDLocation(line: 6, column: 8, scope: !18)
 !28 = !{!29, !30, i64 0}
 !29 = !{!"b", !30, i64 0}
 !30 = !{!"any pointer", !31, i64 0}
 !31 = !{!"omnipotent char", !32, i64 0}
 !32 = !{!"Simple C/C++ TBAA"}
 !33 = !{!30, !30, i64 0}
-!34 = !{i32 8, i32 1, !4, null}
+!34 = !MDLocation(line: 8, column: 1, scope: !4)