2 files changed, 17 insertions, 6 deletions
diff --git a/llvm/test/Assembler/2010-02-05-FunctionLocalMetadataBecomesNull.ll b/llvm/test/Assembler/2010-02-05-FunctionLocalMetadataBecomesNull.ll
index 24ceaa4987f..09706c2a4f9 100644
--- a/llvm/test/Assembler/2010-02-05-FunctionLocalMetadataBecomesNull.ll
+++ b/llvm/test/Assembler/2010-02-05-FunctionLocalMetadataBecomesNull.ll
@@ -22,6 +22,8 @@ define i32 @main() nounwind readonly !dbg !1 {
   ret i32 4, !dbg !DILocation(scope: !1)
 }
 
+!llvm.dbg.cu = !{!6}
+
 declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone
 
 !7 = !{!1}
@@ -33,7 +35,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone
 !4 = !{!5}
 !5 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed)
 !8 = !DIFile(filename: "/d/j/debug-test.c", directory: "/Volumes/Data/b")
-!9 = !{i32 0}
+!9 = !{}
 
 !llvm.module.flags = !{!10}
 !10 = !{i32 1, !"Debug Info Version", i32 3}
diff --git a/llvm/test/Assembler/metadata.ll b/llvm/test/Assembler/metadata.ll
index 8c7781e887d..ee998e3e7e6 100644
--- a/llvm/test/Assembler/metadata.ll
+++ b/llvm/test/Assembler/metadata.ll
@@ -2,7 +2,7 @@
 ; RUN: verify-uselistorder %s
 
 ; CHECK-LABEL: @test
-; CHECK: ret void, !bar !1, !foo !0
+; CHECK: ret void, !bar !4, !foo !5
 define void @test() {
   add i32 2, 1, !bar !0
   add i32 1, 2, !foo !1
@@ -11,29 +11,38 @@ define void @test() {
   ret void, !foo !0, !bar !1
 }
 
-; CHECK-LABEL: define void @test2() !foo !2 !baz !3
+; CHECK-LABEL: define void @test2() !foo !6 !baz !7
 define void @test2() !foo !2 !baz !3 {
   unreachable
 }
 
-; CHECK-LABEL: define void @test3() !bar !3
-; CHECK: unreachable, !bar !4
+; CHECK-LABEL: define void @test3() !bar !7
+; CHECK: unreachable, !bar !8
 define void @test3() !bar !3 {
   unreachable, !bar !4
 }
 
 ; CHECK-LABEL: define void @test_attachment_name() {
-; CHECK:   unreachable, !\342abc !4
+; CHECK:   unreachable, !\342abc !8
 define void @test_attachment_name() {
   ;; Escape the first character when printing text IR, since it's a digit
   unreachable, !\34\32abc !4
 }
 
+!llvm.module.flags = !{!7}
+!llvm.dbg.cu = !{!5}
 !0 = !DILocation(line: 662302, column: 26, scope: !1)
 !1 = distinct !DISubprogram(name: "foo")
 !2 = distinct !{}
 !3 = distinct !{}
 !4 = distinct !{}
+!5 = distinct !DICompileUnit(language: DW_LANG_C99, producer: "clang",
+                             file: !6,
+                             isOptimized: true, flags: "-O2",
+                             splitDebugFilename: "abc.debug", emissionKind: 2,
+                             subprograms: !{!1})
+!6 = !DIFile(filename: "path/to/file", directory: "/path/to/dir")
+!7 = !{i32 2, !"Debug Info Version", i32 3}
 
 declare void @llvm.dbg.func.start(metadata) nounwind readnone