diff options
Diffstat (limited to 'llvm/test/Assembler')
66 files changed, 281 insertions, 281 deletions
diff --git a/llvm/test/Assembler/2010-02-05-FunctionLocalMetadataBecomesNull.ll b/llvm/test/Assembler/2010-02-05-FunctionLocalMetadataBecomesNull.ll index 24d17139c85..8a6735fbca4 100644 --- a/llvm/test/Assembler/2010-02-05-FunctionLocalMetadataBecomesNull.ll +++ b/llvm/test/Assembler/2010-02-05-FunctionLocalMetadataBecomesNull.ll @@ -13,7 +13,7 @@ target triple = "x86_64-apple-darwin10.2" define i32 @main() nounwind readonly { %diff1 = alloca i64 ; <i64*> [#uses=2] ; CHECK: call void @llvm.dbg.value(metadata i64 72, - call void @llvm.dbg.declare(metadata i64* %diff1, metadata !0, metadata !MDExpression()), !dbg !MDLocation(scope: !1) + call void @llvm.dbg.declare(metadata i64* %diff1, metadata !0, metadata !DIExpression()), !dbg !DILocation(scope: !1) store i64 72, i64* %diff1, align 8 %v1 = load %struct.test*, %struct.test** @TestArrayPtr, align 8 ; <%struct.test*> [#uses=1] %v2 = ptrtoint %struct.test* %v1 to i64 ; <i64> [#uses=1] @@ -25,14 +25,14 @@ define i32 @main() nounwind readonly { declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !7 = !{!1} -!6 = !MDCompileUnit(language: DW_LANG_C99, producer: "clang version 3.0 (trunk 131941)", isOptimized: true, emissionKind: 0, file: !8, enums: !9, retainedTypes: !9, subprograms: !7) -!0 = !MDLocalVariable(tag: DW_TAG_auto_variable, name: "c", line: 2, scope: !1, file: !2, type: !5) -!1 = !MDSubprogram(name: "main", line: 1, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 1, file: !8, scope: !2, type: !3, function: i32 ()* @main) -!2 = !MDFile(filename: "/d/j/debug-test.c", directory: "/Volumes/Data/b") -!3 = !MDSubroutineType(types: !4) +!6 = !DICompileUnit(language: DW_LANG_C99, producer: "clang version 3.0 (trunk 131941)", isOptimized: true, emissionKind: 0, file: !8, enums: !9, retainedTypes: !9, subprograms: !7) +!0 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "c", line: 2, scope: !1, file: !2, type: !5) +!1 = !DISubprogram(name: "main", line: 1, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 1, file: !8, scope: !2, type: !3, function: i32 ()* @main) +!2 = !DIFile(filename: "/d/j/debug-test.c", directory: "/Volumes/Data/b") +!3 = !DISubroutineType(types: !4) !4 = !{!5} -!5 = !MDBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -!8 = !MDFile(filename: "/d/j/debug-test.c", directory: "/Volumes/Data/b") +!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} !llvm.module.flags = !{!10} diff --git a/llvm/test/Assembler/debug-info.ll b/llvm/test/Assembler/debug-info.ll index 417c479a8be..91dfe561a2f 100644 --- a/llvm/test/Assembler/debug-info.ll +++ b/llvm/test/Assembler/debug-info.ll @@ -4,69 +4,69 @@ ; CHECK: !named = !{!0, !0, !1, !2, !3, !4, !5, !6, !7, !8, !8, !9, !10, !11, !12, !13, !14, !15, !16, !17, !18, !19, !20, !21, !22, !23, !24, !25, !26, !27, !27} !named = !{!0, !1, !2, !3, !4, !5, !6, !7, !8, !9, !10, !11, !12, !13, !14, !15, !16, !17, !18, !19, !20, !21, !22, !23, !24, !25, !26, !27, !28, !29, !30} -; CHECK: !0 = !MDSubrange(count: 3) -; CHECK-NEXT: !1 = !MDSubrange(count: 3, lowerBound: 4) -; CHECK-NEXT: !2 = !MDSubrange(count: 3, lowerBound: -5) -!0 = !MDSubrange(count: 3) -!1 = !MDSubrange(count: 3, lowerBound: 0) +; CHECK: !0 = !DISubrange(count: 3) +; CHECK-NEXT: !1 = !DISubrange(count: 3, lowerBound: 4) +; CHECK-NEXT: !2 = !DISubrange(count: 3, lowerBound: -5) +!0 = !DISubrange(count: 3) +!1 = !DISubrange(count: 3, lowerBound: 0) -!2 = !MDSubrange(count: 3, lowerBound: 4) -!3 = !MDSubrange(count: 3, lowerBound: -5) +!2 = !DISubrange(count: 3, lowerBound: 4) +!3 = !DISubrange(count: 3, lowerBound: -5) -; CHECK-NEXT: !3 = !MDEnumerator(name: "seven", value: 7) -; CHECK-NEXT: !4 = !MDEnumerator(name: "negeight", value: -8) -; CHECK-NEXT: !5 = !MDEnumerator(name: "", value: 0) -!4 = !MDEnumerator(name: "seven", value: 7) -!5 = !MDEnumerator(name: "negeight", value: -8) -!6 = !MDEnumerator(name: "", value: 0) +; CHECK-NEXT: !3 = !DIEnumerator(name: "seven", value: 7) +; CHECK-NEXT: !4 = !DIEnumerator(name: "negeight", value: -8) +; CHECK-NEXT: !5 = !DIEnumerator(name: "", value: 0) +!4 = !DIEnumerator(name: "seven", value: 7) +!5 = !DIEnumerator(name: "negeight", value: -8) +!6 = !DIEnumerator(name: "", value: 0) -; CHECK-NEXT: !6 = !MDBasicType(name: "name", size: 1, align: 2, encoding: DW_ATE_unsigned_char) -; CHECK-NEXT: !7 = !MDBasicType(tag: DW_TAG_unspecified_type, name: "decltype(nullptr)") -; CHECK-NEXT: !8 = !MDBasicType() -!7 = !MDBasicType(tag: DW_TAG_base_type, name: "name", size: 1, align: 2, encoding: DW_ATE_unsigned_char) -!8 = !MDBasicType(tag: DW_TAG_unspecified_type, name: "decltype(nullptr)") -!9 = !MDBasicType() -!10 = !MDBasicType(tag: DW_TAG_base_type, name: "", size: 0, align: 0, encoding: 0) +; CHECK-NEXT: !6 = !DIBasicType(name: "name", size: 1, align: 2, encoding: DW_ATE_unsigned_char) +; CHECK-NEXT: !7 = !DIBasicType(tag: DW_TAG_unspecified_type, name: "decltype(nullptr)") +; CHECK-NEXT: !8 = !DIBasicType() +!7 = !DIBasicType(tag: DW_TAG_base_type, name: "name", size: 1, align: 2, encoding: DW_ATE_unsigned_char) +!8 = !DIBasicType(tag: DW_TAG_unspecified_type, name: "decltype(nullptr)") +!9 = !DIBasicType() +!10 = !DIBasicType(tag: DW_TAG_base_type, name: "", size: 0, align: 0, encoding: 0) -; CHECK-NEXT: !9 = !MDTemplateTypeParameter(type: !6) -; CHECK-NEXT: !10 = !MDFile(filename: "path/to/file", directory: "/path/to/dir") +; CHECK-NEXT: !9 = !DITemplateTypeParameter(type: !6) +; CHECK-NEXT: !10 = !DIFile(filename: "path/to/file", directory: "/path/to/dir") ; CHECK-NEXT: !11 = distinct !{} -; CHECK-NEXT: !12 = !MDFile(filename: "", directory: "") -!11 = !MDTemplateTypeParameter(type: !7) -!12 = !MDFile(filename: "path/to/file", directory: "/path/to/dir") +; CHECK-NEXT: !12 = !DIFile(filename: "", directory: "") +!11 = !DITemplateTypeParameter(type: !7) +!12 = !DIFile(filename: "path/to/file", directory: "/path/to/dir") !13 = distinct !{} -!14 = !MDFile(filename: "", directory: "") +!14 = !DIFile(filename: "", directory: "") -; CHECK-NEXT: !13 = !MDDerivedType(tag: DW_TAG_pointer_type, baseType: !6, size: 32, align: 32) -!15 = !MDDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 32, align: 32) +; CHECK-NEXT: !13 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !6, size: 32, align: 32) +!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 32, align: 32) -; CHECK-NEXT: !14 = !MDCompositeType(tag: DW_TAG_structure_type, name: "MyType", file: !10, line: 2, size: 32, align: 32, identifier: "MangledMyType") -; CHECK-NEXT: !15 = distinct !MDCompositeType(tag: DW_TAG_structure_type, name: "Base", scope: !14, file: !10, line: 3, size: 128, align: 32, offset: 64, flags: DIFlagPublic, elements: !16, runtimeLang: DW_LANG_C_plus_plus_11, vtableHolder: !15, templateParams: !18, identifier: "MangledBase") +; CHECK-NEXT: !14 = !DICompositeType(tag: DW_TAG_structure_type, name: "MyType", file: !10, line: 2, size: 32, align: 32, identifier: "MangledMyType") +; CHECK-NEXT: !15 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Base", scope: !14, file: !10, line: 3, size: 128, align: 32, offset: 64, flags: DIFlagPublic, elements: !16, runtimeLang: DW_LANG_C_plus_plus_11, vtableHolder: !15, templateParams: !18, identifier: "MangledBase") ; CHECK-NEXT: !16 = !{!17} -; CHECK-NEXT: !17 = !MDDerivedType(tag: DW_TAG_member, name: "field", scope: !15, file: !10, line: 4, baseType: !6, size: 32, align: 32, offset: 32, flags: DIFlagPublic) +; CHECK-NEXT: !17 = !DIDerivedType(tag: DW_TAG_member, name: "field", scope: !15, file: !10, line: 4, baseType: !6, size: 32, align: 32, offset: 32, flags: DIFlagPublic) ; CHECK-NEXT: !18 = !{!9} -; CHECK-NEXT: !19 = !MDCompositeType(tag: DW_TAG_structure_type, name: "Derived", scope: !14, file: !10, line: 3, baseType: !15, size: 128, align: 32, offset: 64, flags: DIFlagPublic, elements: !20, runtimeLang: DW_LANG_C_plus_plus_11, vtableHolder: !15, templateParams: !18, identifier: "MangledBase") +; CHECK-NEXT: !19 = !DICompositeType(tag: DW_TAG_structure_type, name: "Derived", scope: !14, file: !10, line: 3, baseType: !15, size: 128, align: 32, offset: 64, flags: DIFlagPublic, elements: !20, runtimeLang: DW_LANG_C_plus_plus_11, vtableHolder: !15, templateParams: !18, identifier: "MangledBase") ; CHECK-NEXT: !20 = !{!21} -; CHECK-NEXT: !21 = !MDDerivedType(tag: DW_TAG_inheritance, scope: !19, baseType: !15) -; CHECK-NEXT: !22 = !MDDerivedType(tag: DW_TAG_ptr_to_member_type, baseType: !6, size: 32, align: 32, extraData: !15) -; CHECK-NEXT: !23 = !MDCompositeType(tag: DW_TAG_structure_type) -; CHECK-NEXT: !24 = !MDCompositeType(tag: DW_TAG_structure_type, runtimeLang: DW_LANG_Cobol85) -!16 = !MDCompositeType(tag: DW_TAG_structure_type, name: "MyType", file: !12, line: 2, size: 32, align: 32, identifier: "MangledMyType") -!17 = !MDCompositeType(tag: DW_TAG_structure_type, name: "Base", scope: !16, file: !12, line: 3, size: 128, align: 32, offset: 64, flags: DIFlagPublic, elements: !18, runtimeLang: DW_LANG_C_plus_plus_11, vtableHolder: !17, templateParams: !20, identifier: "MangledBase") +; CHECK-NEXT: !21 = !DIDerivedType(tag: DW_TAG_inheritance, scope: !19, baseType: !15) +; CHECK-NEXT: !22 = !DIDerivedType(tag: DW_TAG_ptr_to_member_type, baseType: !6, size: 32, align: 32, extraData: !15) +; CHECK-NEXT: !23 = !DICompositeType(tag: DW_TAG_structure_type) +; CHECK-NEXT: !24 = !DICompositeType(tag: DW_TAG_structure_type, runtimeLang: DW_LANG_Cobol85) +!16 = !DICompositeType(tag: DW_TAG_structure_type, name: "MyType", file: !12, line: 2, size: 32, align: 32, identifier: "MangledMyType") +!17 = !DICompositeType(tag: DW_TAG_structure_type, name: "Base", scope: !16, file: !12, line: 3, size: 128, align: 32, offset: 64, flags: DIFlagPublic, elements: !18, runtimeLang: DW_LANG_C_plus_plus_11, vtableHolder: !17, templateParams: !20, identifier: "MangledBase") !18 = !{!19} -!19 = !MDDerivedType(tag: DW_TAG_member, name: "field", scope: !17, file: !12, line: 4, baseType: !7, size: 32, align: 32, offset: 32, flags: DIFlagPublic) +!19 = !DIDerivedType(tag: DW_TAG_member, name: "field", scope: !17, file: !12, line: 4, baseType: !7, size: 32, align: 32, offset: 32, flags: DIFlagPublic) !20 = !{!11} -!21 = !MDCompositeType(tag: DW_TAG_structure_type, name: "Derived", scope: !16, file: !12, line: 3, baseType: !17, size: 128, align: 32, offset: 64, flags: DIFlagPublic, elements: !22, runtimeLang: DW_LANG_C_plus_plus_11, vtableHolder: !17, templateParams: !20, identifier: "MangledBase") +!21 = !DICompositeType(tag: DW_TAG_structure_type, name: "Derived", scope: !16, file: !12, line: 3, baseType: !17, size: 128, align: 32, offset: 64, flags: DIFlagPublic, elements: !22, runtimeLang: DW_LANG_C_plus_plus_11, vtableHolder: !17, templateParams: !20, identifier: "MangledBase") !22 = !{!23} -!23 = !MDDerivedType(tag: DW_TAG_inheritance, scope: !21, baseType: !17) -!24 = !MDDerivedType(tag: DW_TAG_ptr_to_member_type, baseType: !7, size: 32, align: 32, extraData: !17) -!25 = !MDCompositeType(tag: DW_TAG_structure_type) -!26 = !MDCompositeType(tag: DW_TAG_structure_type, runtimeLang: 6) +!23 = !DIDerivedType(tag: DW_TAG_inheritance, scope: !21, baseType: !17) +!24 = !DIDerivedType(tag: DW_TAG_ptr_to_member_type, baseType: !7, size: 32, align: 32, extraData: !17) +!25 = !DICompositeType(tag: DW_TAG_structure_type) +!26 = !DICompositeType(tag: DW_TAG_structure_type, runtimeLang: 6) ; !25 = !{!7, !7} -; !26 = !MDSubroutineType(flags: DIFlagPublic | DIFlagStaticMember, types: !25) -; !27 = !MDSubroutineType(types: !25) +; !26 = !DISubroutineType(flags: DIFlagPublic | DIFlagStaticMember, types: !25) +; !27 = !DISubroutineType(types: !25) !27 = !{!7, !7} -!28 = !MDSubroutineType(flags: DIFlagPublic | DIFlagStaticMember, types: !27) -!29 = !MDSubroutineType(flags: 0, types: !27) -!30 = !MDSubroutineType(types: !27) +!28 = !DISubroutineType(flags: DIFlagPublic | DIFlagStaticMember, types: !27) +!29 = !DISubroutineType(flags: 0, types: !27) +!30 = !DISubroutineType(types: !27) diff --git a/llvm/test/Assembler/drop-debug-info.ll b/llvm/test/Assembler/drop-debug-info.ll index 698975d8998..44a7b78b004 100644 --- a/llvm/test/Assembler/drop-debug-info.ll +++ b/llvm/test/Assembler/drop-debug-info.ll @@ -12,17 +12,17 @@ entry: !llvm.dbg.cu = !{!0} !llvm.module.flags = !{!9} -!0 = !MDCompileUnit(language: DW_LANG_C99, producer: "clang version 3.5 (trunk 195495) (llvm/trunk 195495:195504M)", isOptimized: false, emissionKind: 0, file: !1, enums: !2, retainedTypes: !2, subprograms: !3, globals: !2, imports: !2) -!1 = !MDFile(filename: "../llvm/tools/clang/test/CodeGen/debug-info-version.c", directory: "/Users/manmanren/llvm_gmail/release") +!0 = !DICompileUnit(language: DW_LANG_C99, producer: "clang version 3.5 (trunk 195495) (llvm/trunk 195495:195504M)", isOptimized: false, emissionKind: 0, file: !1, enums: !2, retainedTypes: !2, subprograms: !3, globals: !2, imports: !2) +!1 = !DIFile(filename: "../llvm/tools/clang/test/CodeGen/debug-info-version.c", directory: "/Users/manmanren/llvm_gmail/release") !2 = !{i32 0} !3 = !{!4} -!4 = !MDSubprogram(name: "main", line: 3, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 3, file: !1, scope: !5, type: !6, function: i32 ()* @main, variables: !2) -!5 = !MDFile(filename: "../llvm/tools/clang/test/CodeGen/debug-info-version.c", directory: "/Users/manmanren/llvm_gmail/release") -!6 = !MDSubroutineType(types: !7) +!4 = !DISubprogram(name: "main", line: 3, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 3, file: !1, scope: !5, type: !6, function: i32 ()* @main, variables: !2) +!5 = !DIFile(filename: "../llvm/tools/clang/test/CodeGen/debug-info-version.c", directory: "/Users/manmanren/llvm_gmail/release") +!6 = !DISubroutineType(types: !7) !7 = !{!8} -!8 = !MDBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) +!8 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !9 = !{i32 2, !"Dwarf Version", i32 2} -!12 = !MDLocation(line: 4, scope: !4) +!12 = !DILocation(line: 4, scope: !4) ; WARN: warning: ignoring debug info with an invalid version (0) ; CHECK-NOT: !dbg diff --git a/llvm/test/Assembler/generic-debug-node.ll b/llvm/test/Assembler/generic-debug-node.ll index cb7222b043d..5fb72faa18e 100644 --- a/llvm/test/Assembler/generic-debug-node.ll +++ b/llvm/test/Assembler/generic-debug-node.ll @@ -7,21 +7,21 @@ ; CHECK: !0 = !{} !0 = !{} -; CHECK-NEXT: !1 = !GenericDebugNode(tag: DW_TAG_entry_point, header: "some\00header", operands: {!0, !2, !2}) -!1 = !GenericDebugNode(tag: 3, header: "some\00header", operands: {!0, !3, !4}) -!2 = !GenericDebugNode(tag: 3, header: "some\00header", operands: {!{}, !3, !4}) +; CHECK-NEXT: !1 = !GenericDINode(tag: DW_TAG_entry_point, header: "some\00header", operands: {!0, !2, !2}) +!1 = !GenericDINode(tag: 3, header: "some\00header", operands: {!0, !3, !4}) +!2 = !GenericDINode(tag: 3, header: "some\00header", operands: {!{}, !3, !4}) -; CHECK-NEXT: !2 = !GenericDebugNode(tag: DW_TAG_entry_point) -!3 = !GenericDebugNode(tag: 3) -!4 = !GenericDebugNode(tag: 3, header: "") -!5 = !GenericDebugNode(tag: 3, operands: {}) -!6 = !GenericDebugNode(tag: 3, header: "", operands: {}) +; CHECK-NEXT: !2 = !GenericDINode(tag: DW_TAG_entry_point) +!3 = !GenericDINode(tag: 3) +!4 = !GenericDINode(tag: 3, header: "") +!5 = !GenericDINode(tag: 3, operands: {}) +!6 = !GenericDINode(tag: 3, header: "", operands: {}) -; CHECK-NEXT: !3 = distinct !GenericDebugNode(tag: DW_TAG_entry_point) -!7 = distinct !GenericDebugNode(tag: 3) +; CHECK-NEXT: !3 = distinct !GenericDINode(tag: DW_TAG_entry_point) +!7 = distinct !GenericDINode(tag: 3) -; CHECK-NEXT: !4 = !GenericDebugNode(tag: 65535) -!8 = !GenericDebugNode(tag: 65535) +; CHECK-NEXT: !4 = !GenericDINode(tag: 65535) +!8 = !GenericDINode(tag: 65535) ; CHECK-NOT: ! -!9 = !GenericDebugNode(tag: DW_TAG_entry_point) +!9 = !GenericDINode(tag: DW_TAG_entry_point) diff --git a/llvm/test/Assembler/invalid-generic-debug-node-tag-bad.ll b/llvm/test/Assembler/invalid-generic-debug-node-tag-bad.ll index 98c10b6a878..8da140f33ce 100644 --- a/llvm/test/Assembler/invalid-generic-debug-node-tag-bad.ll +++ b/llvm/test/Assembler/invalid-generic-debug-node-tag-bad.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s -; CHECK: <stdin>:[[@LINE+1]]:29: error: invalid DWARF tag 'DW_TAG_badtag' -!0 = !GenericDebugNode(tag: DW_TAG_badtag) +; CHECK: <stdin>:[[@LINE+1]]:26: error: invalid DWARF tag 'DW_TAG_badtag' +!0 = !GenericDINode(tag: DW_TAG_badtag) diff --git a/llvm/test/Assembler/invalid-generic-debug-node-tag-missing.ll b/llvm/test/Assembler/invalid-generic-debug-node-tag-missing.ll index 5372cbb0880..0ae2c7194a7 100644 --- a/llvm/test/Assembler/invalid-generic-debug-node-tag-missing.ll +++ b/llvm/test/Assembler/invalid-generic-debug-node-tag-missing.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s -; CHECK: <stdin>:[[@LINE+1]]:47: error: missing required field 'tag' -!0 = !GenericDebugNode(header: "some\00header") +; CHECK: <stdin>:[[@LINE+1]]:44: error: missing required field 'tag' +!0 = !GenericDINode(header: "some\00header") diff --git a/llvm/test/Assembler/invalid-generic-debug-node-tag-overflow.ll b/llvm/test/Assembler/invalid-generic-debug-node-tag-overflow.ll index b5189469f07..1349dc0a2e2 100644 --- a/llvm/test/Assembler/invalid-generic-debug-node-tag-overflow.ll +++ b/llvm/test/Assembler/invalid-generic-debug-node-tag-overflow.ll @@ -1,7 +1,7 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK-NOT: error: -!0 = !GenericDebugNode(tag: 65535) +!0 = !GenericDINode(tag: 65535) -; CHECK: <stdin>:[[@LINE+1]]:29: error: value for 'tag' too large, limit is 65535 -!1 = !GenericDebugNode(tag: 65536) +; CHECK: <stdin>:[[@LINE+1]]:26: error: value for 'tag' too large, limit is 65535 +!1 = !GenericDINode(tag: 65536) diff --git a/llvm/test/Assembler/invalid-generic-debug-node-tag-wrong-type.ll b/llvm/test/Assembler/invalid-generic-debug-node-tag-wrong-type.ll index fca24a70bf0..7d0c04af914 100644 --- a/llvm/test/Assembler/invalid-generic-debug-node-tag-wrong-type.ll +++ b/llvm/test/Assembler/invalid-generic-debug-node-tag-wrong-type.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s -; CHECK: <stdin>:[[@LINE+1]]:29: error: expected DWARF tag -!0 = !GenericDebugNode(tag: "string") +; CHECK: <stdin>:[[@LINE+1]]:26: error: expected DWARF tag +!0 = !GenericDINode(tag: "string") diff --git a/llvm/test/Assembler/invalid-mdcompileunit-language-bad.ll b/llvm/test/Assembler/invalid-mdcompileunit-language-bad.ll index cf2da20061c..e6f49f3fba4 100644 --- a/llvm/test/Assembler/invalid-mdcompileunit-language-bad.ll +++ b/llvm/test/Assembler/invalid-mdcompileunit-language-bad.ll @@ -1,5 +1,5 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: <stdin>:[[@LINE+1]]:31: error: invalid DWARF language 'DW_LANG_NoSuchLanguage' -!0 = !MDCompileUnit(language: DW_LANG_NoSuchLanguage, - file: !MDFile(filename: "a", directory: "b")) +!0 = !DICompileUnit(language: DW_LANG_NoSuchLanguage, + file: !DIFile(filename: "a", directory: "b")) diff --git a/llvm/test/Assembler/invalid-mdcompileunit-language-overflow.ll b/llvm/test/Assembler/invalid-mdcompileunit-language-overflow.ll index 1849867edae..c558f7aaa25 100644 --- a/llvm/test/Assembler/invalid-mdcompileunit-language-overflow.ll +++ b/llvm/test/Assembler/invalid-mdcompileunit-language-overflow.ll @@ -1,9 +1,9 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK-NOT: error: -!0 = !MDCompileUnit(language: 65535, - file: !MDFile(filename: "a", directory: "b")) +!0 = !DICompileUnit(language: 65535, + file: !DIFile(filename: "a", directory: "b")) ; CHECK: <stdin>:[[@LINE+1]]:31: error: value for 'language' too large, limit is 65535 -!1 = !MDCompileUnit(language: 65536, - file: !MDFile(filename: "a", directory: "b")) +!1 = !DICompileUnit(language: 65536, + file: !DIFile(filename: "a", directory: "b")) diff --git a/llvm/test/Assembler/invalid-mdcompileunit-missing-language.ll b/llvm/test/Assembler/invalid-mdcompileunit-missing-language.ll index 57a9a3efb66..15631b7f640 100644 --- a/llvm/test/Assembler/invalid-mdcompileunit-missing-language.ll +++ b/llvm/test/Assembler/invalid-mdcompileunit-missing-language.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: <stdin>:[[@LINE+1]]:65: error: missing required field 'language' -!0 = !MDCompileUnit(file: !MDFile(filename: "a", directory: "b")) +!0 = !DICompileUnit(file: !DIFile(filename: "a", directory: "b")) diff --git a/llvm/test/Assembler/invalid-mdcompileunit-null-file.ll b/llvm/test/Assembler/invalid-mdcompileunit-null-file.ll index 613948f24ef..cc1892e9146 100644 --- a/llvm/test/Assembler/invalid-mdcompileunit-null-file.ll +++ b/llvm/test/Assembler/invalid-mdcompileunit-null-file.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: <stdin>:[[@LINE+1]]:27: error: 'file' cannot be null -!0 = !MDCompileUnit(file: null) +!0 = !DICompileUnit(file: null) diff --git a/llvm/test/Assembler/invalid-mdcompositetype-missing-tag.ll b/llvm/test/Assembler/invalid-mdcompositetype-missing-tag.ll index a3b1418d9bc..e68c0147990 100644 --- a/llvm/test/Assembler/invalid-mdcompositetype-missing-tag.ll +++ b/llvm/test/Assembler/invalid-mdcompositetype-missing-tag.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: [[@LINE+1]]:36: error: missing required field 'tag' -!25 = !MDCompositeType(name: "Type") +!25 = !DICompositeType(name: "Type") diff --git a/llvm/test/Assembler/invalid-mdderivedtype-missing-basetype.ll b/llvm/test/Assembler/invalid-mdderivedtype-missing-basetype.ll index 24fa5850d9f..308c2ea90ef 100644 --- a/llvm/test/Assembler/invalid-mdderivedtype-missing-basetype.ll +++ b/llvm/test/Assembler/invalid-mdderivedtype-missing-basetype.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: [[@LINE+1]]:45: error: missing required field 'baseType' -!0 = !MDDerivedType(tag: DW_TAG_pointer_type) +!0 = !DIDerivedType(tag: DW_TAG_pointer_type) diff --git a/llvm/test/Assembler/invalid-mdderivedtype-missing-tag.ll b/llvm/test/Assembler/invalid-mdderivedtype-missing-tag.ll index 36206281aeb..fd286f4c296 100644 --- a/llvm/test/Assembler/invalid-mdderivedtype-missing-tag.ll +++ b/llvm/test/Assembler/invalid-mdderivedtype-missing-tag.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: [[@LINE+1]]:34: error: missing required field 'tag' -!0 = !MDDerivedType(baseType: !{}) +!0 = !DIDerivedType(baseType: !{}) diff --git a/llvm/test/Assembler/invalid-mdenumerator-missing-name.ll b/llvm/test/Assembler/invalid-mdenumerator-missing-name.ll index 709c6a556e6..656d3439ba2 100644 --- a/llvm/test/Assembler/invalid-mdenumerator-missing-name.ll +++ b/llvm/test/Assembler/invalid-mdenumerator-missing-name.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: [[@LINE+1]]:28: error: missing required field 'name' -!0 = !MDEnumerator(value: 7) +!0 = !DIEnumerator(value: 7) diff --git a/llvm/test/Assembler/invalid-mdenumerator-missing-value.ll b/llvm/test/Assembler/invalid-mdenumerator-missing-value.ll index a8501680688..0eee3be41b6 100644 --- a/llvm/test/Assembler/invalid-mdenumerator-missing-value.ll +++ b/llvm/test/Assembler/invalid-mdenumerator-missing-value.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: [[@LINE+1]]:32: error: missing required field 'value' -!0 = !MDEnumerator(name: "name") +!0 = !DIEnumerator(name: "name") diff --git a/llvm/test/Assembler/invalid-mdexpression-large.ll b/llvm/test/Assembler/invalid-mdexpression-large.ll index fb304137ed7..32b77ee5138 100644 --- a/llvm/test/Assembler/invalid-mdexpression-large.ll +++ b/llvm/test/Assembler/invalid-mdexpression-large.ll @@ -1,7 +1,7 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK-NOT: error: -!0 = !MDExpression(18446744073709551615) +!0 = !DIExpression(18446744073709551615) ; CHECK: <stdin>:[[@LINE+1]]:20: error: element too large, limit is 18446744073709551615 -!1 = !MDExpression(18446744073709551616) +!1 = !DIExpression(18446744073709551616) diff --git a/llvm/test/Assembler/invalid-mdexpression-verify.ll b/llvm/test/Assembler/invalid-mdexpression-verify.ll index e573ef32155..50d6943dead 100644 --- a/llvm/test/Assembler/invalid-mdexpression-verify.ll +++ b/llvm/test/Assembler/invalid-mdexpression-verify.ll @@ -4,6 +4,6 @@ ; NOVERIFY: !named = !{!0} !named = !{!0} -; NOVERIFY: !0 = !MDExpression(0, 1, 9, 7, 2) +; NOVERIFY: !0 = !DIExpression(0, 1, 9, 7, 2) ; VERIFY: assembly parsed, but does not verify -!0 = !MDExpression(0, 1, 9, 7, 2) +!0 = !DIExpression(0, 1, 9, 7, 2) diff --git a/llvm/test/Assembler/invalid-mdfile-missing-directory.ll b/llvm/test/Assembler/invalid-mdfile-missing-directory.ll index 825db089656..a54a22f2e18 100644 --- a/llvm/test/Assembler/invalid-mdfile-missing-directory.ll +++ b/llvm/test/Assembler/invalid-mdfile-missing-directory.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: [[@LINE+1]]:30: error: missing required field 'directory' -!0 = !MDFile(filename: "file") +!0 = !DIFile(filename: "file") diff --git a/llvm/test/Assembler/invalid-mdfile-missing-filename.ll b/llvm/test/Assembler/invalid-mdfile-missing-filename.ll index 0dd71179105..17bf3da3f7a 100644 --- a/llvm/test/Assembler/invalid-mdfile-missing-filename.ll +++ b/llvm/test/Assembler/invalid-mdfile-missing-filename.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: [[@LINE+1]]:30: error: missing required field 'filename' -!0 = !MDFile(directory: "dir") +!0 = !DIFile(directory: "dir") diff --git a/llvm/test/Assembler/invalid-mdglobalvariable-empty-name.ll b/llvm/test/Assembler/invalid-mdglobalvariable-empty-name.ll index 77a9f4d773e..a4e69f3c8b7 100644 --- a/llvm/test/Assembler/invalid-mdglobalvariable-empty-name.ll +++ b/llvm/test/Assembler/invalid-mdglobalvariable-empty-name.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: <stdin>:[[@LINE+1]]:30: error: 'name' cannot be empty -!0 = !MDGlobalVariable(name: "") +!0 = !DIGlobalVariable(name: "") diff --git a/llvm/test/Assembler/invalid-mdglobalvariable-missing-name.ll b/llvm/test/Assembler/invalid-mdglobalvariable-missing-name.ll index d57d71e2d95..baf4d73d94f 100644 --- a/llvm/test/Assembler/invalid-mdglobalvariable-missing-name.ll +++ b/llvm/test/Assembler/invalid-mdglobalvariable-missing-name.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: <stdin>:[[@LINE+1]]:24: error: missing required field 'name' -!0 = !MDGlobalVariable() +!0 = !DIGlobalVariable() diff --git a/llvm/test/Assembler/invalid-mdimportedentity-missing-scope.ll b/llvm/test/Assembler/invalid-mdimportedentity-missing-scope.ll index 710a0276480..06164e88d9b 100644 --- a/llvm/test/Assembler/invalid-mdimportedentity-missing-scope.ll +++ b/llvm/test/Assembler/invalid-mdimportedentity-missing-scope.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: [[@LINE+1]]:51: error: missing required field 'scope' -!3 = !MDImportedEntity(tag: DW_TAG_imported_module) +!3 = !DIImportedEntity(tag: DW_TAG_imported_module) diff --git a/llvm/test/Assembler/invalid-mdimportedentity-missing-tag.ll b/llvm/test/Assembler/invalid-mdimportedentity-missing-tag.ll index 63cf0d25650..996b1ffdc9b 100644 --- a/llvm/test/Assembler/invalid-mdimportedentity-missing-tag.ll +++ b/llvm/test/Assembler/invalid-mdimportedentity-missing-tag.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: [[@LINE+1]]:33: error: missing required field 'tag' -!3 = !MDImportedEntity(scope: !0) +!3 = !DIImportedEntity(scope: !0) diff --git a/llvm/test/Assembler/invalid-mdlexicalblock-missing-scope.ll b/llvm/test/Assembler/invalid-mdlexicalblock-missing-scope.ll index cdd12afde58..6108e692b21 100644 --- a/llvm/test/Assembler/invalid-mdlexicalblock-missing-scope.ll +++ b/llvm/test/Assembler/invalid-mdlexicalblock-missing-scope.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: [[@LINE+1]]:29: error: missing required field 'scope' -!0 = !MDLexicalBlock(line: 7) +!0 = !DILexicalBlock(line: 7) diff --git a/llvm/test/Assembler/invalid-mdlexicalblock-null-scope.ll b/llvm/test/Assembler/invalid-mdlexicalblock-null-scope.ll index 59a99684797..7457b6085d6 100644 --- a/llvm/test/Assembler/invalid-mdlexicalblock-null-scope.ll +++ b/llvm/test/Assembler/invalid-mdlexicalblock-null-scope.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: <stdin>:[[@LINE+1]]:29: error: 'scope' cannot be null -!0 = !MDLexicalBlock(scope: null) +!0 = !DILexicalBlock(scope: null) diff --git a/llvm/test/Assembler/invalid-mdlexicalblockfile-missing-discriminator.ll b/llvm/test/Assembler/invalid-mdlexicalblockfile-missing-discriminator.ll index b71eed82cc4..bd8395ccf4d 100644 --- a/llvm/test/Assembler/invalid-mdlexicalblockfile-missing-discriminator.ll +++ b/llvm/test/Assembler/invalid-mdlexicalblockfile-missing-discriminator.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: [[@LINE+1]]:36: error: missing required field 'discriminator' -!0 = !MDLexicalBlockFile(scope: !{}) +!0 = !DILexicalBlockFile(scope: !{}) diff --git a/llvm/test/Assembler/invalid-mdlexicalblockfile-missing-scope.ll b/llvm/test/Assembler/invalid-mdlexicalblockfile-missing-scope.ll index 1c901e25cb5..fd037501c40 100644 --- a/llvm/test/Assembler/invalid-mdlexicalblockfile-missing-scope.ll +++ b/llvm/test/Assembler/invalid-mdlexicalblockfile-missing-scope.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: [[@LINE+1]]:42: error: missing required field 'scope' -!0 = !MDLexicalBlockFile(discriminator: 0) +!0 = !DILexicalBlockFile(discriminator: 0) diff --git a/llvm/test/Assembler/invalid-mdlexicalblockfile-null-scope.ll b/llvm/test/Assembler/invalid-mdlexicalblockfile-null-scope.ll index 708136c6328..ae1a5d432e3 100644 --- a/llvm/test/Assembler/invalid-mdlexicalblockfile-null-scope.ll +++ b/llvm/test/Assembler/invalid-mdlexicalblockfile-null-scope.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: <stdin>:[[@LINE+1]]:33: error: 'scope' cannot be null -!0 = !MDLexicalBlockFile(scope: null) +!0 = !DILexicalBlockFile(scope: null) diff --git a/llvm/test/Assembler/invalid-mdlocalvariable-missing-scope.ll b/llvm/test/Assembler/invalid-mdlocalvariable-missing-scope.ll index d8ee8a97307..45dcad71360 100644 --- a/llvm/test/Assembler/invalid-mdlocalvariable-missing-scope.ll +++ b/llvm/test/Assembler/invalid-mdlocalvariable-missing-scope.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: <stdin>:[[@LINE+1]]:48: error: missing required field 'scope' -!0 = !MDLocalVariable(tag: DW_TAG_auto_variable) +!0 = !DILocalVariable(tag: DW_TAG_auto_variable) diff --git a/llvm/test/Assembler/invalid-mdlocalvariable-missing-tag.ll b/llvm/test/Assembler/invalid-mdlocalvariable-missing-tag.ll index d3ca10a2013..18062edf75b 100644 --- a/llvm/test/Assembler/invalid-mdlocalvariable-missing-tag.ll +++ b/llvm/test/Assembler/invalid-mdlocalvariable-missing-tag.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: <stdin>:[[@LINE+1]]:45: error: missing required field 'tag' -!0 = !MDLocalVariable(scope: !MDSubprogram()) +!0 = !DILocalVariable(scope: !DISubprogram()) diff --git a/llvm/test/Assembler/invalid-mdlocalvariable-null-scope.ll b/llvm/test/Assembler/invalid-mdlocalvariable-null-scope.ll index 53ee94de79b..859412a2568 100644 --- a/llvm/test/Assembler/invalid-mdlocalvariable-null-scope.ll +++ b/llvm/test/Assembler/invalid-mdlocalvariable-null-scope.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: <stdin>:[[@LINE+1]]:30: error: 'scope' cannot be null -!0 = !MDLocalVariable(scope: null) +!0 = !DILocalVariable(scope: null) diff --git a/llvm/test/Assembler/invalid-mdlocation-field-bad.ll b/llvm/test/Assembler/invalid-mdlocation-field-bad.ll index 6ec7c64bb4d..e68aa45b03e 100644 --- a/llvm/test/Assembler/invalid-mdlocation-field-bad.ll +++ b/llvm/test/Assembler/invalid-mdlocation-field-bad.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: <stdin>:[[@LINE+1]]:18: error: invalid field 'bad' -!0 = !MDLocation(bad: 0) +!0 = !DILocation(bad: 0) diff --git a/llvm/test/Assembler/invalid-mdlocation-field-twice.ll b/llvm/test/Assembler/invalid-mdlocation-field-twice.ll index 2335c935a5f..d1dab68246c 100644 --- a/llvm/test/Assembler/invalid-mdlocation-field-twice.ll +++ b/llvm/test/Assembler/invalid-mdlocation-field-twice.ll @@ -3,4 +3,4 @@ !0 = !{} ; CHECK: <stdin>:[[@LINE+1]]:38: error: field 'line' cannot be specified more than once -!1 = !MDLocation(line: 3, scope: !0, line: 3) +!1 = !DILocation(line: 3, scope: !0, line: 3) diff --git a/llvm/test/Assembler/invalid-mdlocation-missing-scope-2.ll b/llvm/test/Assembler/invalid-mdlocation-missing-scope-2.ll index 3b267c9199b..380e3fde94f 100644 --- a/llvm/test/Assembler/invalid-mdlocation-missing-scope-2.ll +++ b/llvm/test/Assembler/invalid-mdlocation-missing-scope-2.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: <stdin>:[[@LINE+1]]:25: error: missing required field 'scope' -!0 = !MDLocation(line: 7) +!0 = !DILocation(line: 7) diff --git a/llvm/test/Assembler/invalid-mdlocation-missing-scope.ll b/llvm/test/Assembler/invalid-mdlocation-missing-scope.ll index 87f41b31799..fb0cd866dc1 100644 --- a/llvm/test/Assembler/invalid-mdlocation-missing-scope.ll +++ b/llvm/test/Assembler/invalid-mdlocation-missing-scope.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: <stdin>:[[@LINE+1]]:18: error: missing required field 'scope' -!0 = !MDLocation() +!0 = !DILocation() diff --git a/llvm/test/Assembler/invalid-mdlocation-null-scope.ll b/llvm/test/Assembler/invalid-mdlocation-null-scope.ll index e359c9fe424..38c59e15d15 100644 --- a/llvm/test/Assembler/invalid-mdlocation-null-scope.ll +++ b/llvm/test/Assembler/invalid-mdlocation-null-scope.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: <stdin>:[[@LINE+1]]:25: error: 'scope' cannot be null -!0 = !MDLocation(scope: null) +!0 = !DILocation(scope: null) diff --git a/llvm/test/Assembler/invalid-mdlocation-overflow-column.ll b/llvm/test/Assembler/invalid-mdlocation-overflow-column.ll index 1c06697d01e..043f84d3ab2 100644 --- a/llvm/test/Assembler/invalid-mdlocation-overflow-column.ll +++ b/llvm/test/Assembler/invalid-mdlocation-overflow-column.ll @@ -3,7 +3,7 @@ !0 = !{} ; CHECK-NOT: error: -!1 = !MDLocation(column: 65535, scope: !0) +!1 = !DILocation(column: 65535, scope: !0) ; CHECK: <stdin>:[[@LINE+1]]:26: error: value for 'column' too large, limit is 65535 -!2 = !MDLocation(column: 65536, scope: !0) +!2 = !DILocation(column: 65536, scope: !0) diff --git a/llvm/test/Assembler/invalid-mdlocation-overflow-line.ll b/llvm/test/Assembler/invalid-mdlocation-overflow-line.ll index 571a555daef..7a6774231a9 100644 --- a/llvm/test/Assembler/invalid-mdlocation-overflow-line.ll +++ b/llvm/test/Assembler/invalid-mdlocation-overflow-line.ll @@ -3,7 +3,7 @@ !0 = !{} ; CHECK-NOT: error: -!1 = !MDLocation(line: 4294967295, scope: !0) +!1 = !DILocation(line: 4294967295, scope: !0) ; CHECK: <stdin>:[[@LINE+1]]:24: error: value for 'line' too large, limit is 4294967295 -!2 = !MDLocation(line: 4294967296, scope: !0) +!2 = !DILocation(line: 4294967296, scope: !0) diff --git a/llvm/test/Assembler/invalid-mdnamespace-missing-namespace.ll b/llvm/test/Assembler/invalid-mdnamespace-missing-namespace.ll index da2f5114221..c29391b125d 100644 --- a/llvm/test/Assembler/invalid-mdnamespace-missing-namespace.ll +++ b/llvm/test/Assembler/invalid-mdnamespace-missing-namespace.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: [[@LINE+1]]:36: error: missing required field 'scope' -!0 = !MDNamespace(name: "Namespace") +!0 = !DINamespace(name: "Namespace") diff --git a/llvm/test/Assembler/invalid-mdsubrange-count-large.ll b/llvm/test/Assembler/invalid-mdsubrange-count-large.ll index 733c4afa34a..003274f3a07 100644 --- a/llvm/test/Assembler/invalid-mdsubrange-count-large.ll +++ b/llvm/test/Assembler/invalid-mdsubrange-count-large.ll @@ -1,7 +1,7 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK-NOT: error: -!0 = !MDSubrange(count: 9223372036854775807) +!0 = !DISubrange(count: 9223372036854775807) ; CHECK: <stdin>:[[@LINE+1]]:25: error: value for 'count' too large, limit is 9223372036854775807 -!1 = !MDSubrange(count: 9223372036854775808) +!1 = !DISubrange(count: 9223372036854775808) diff --git a/llvm/test/Assembler/invalid-mdsubrange-count-missing.ll b/llvm/test/Assembler/invalid-mdsubrange-count-missing.ll index bf9cb9a5e3d..8fc4487117f 100644 --- a/llvm/test/Assembler/invalid-mdsubrange-count-missing.ll +++ b/llvm/test/Assembler/invalid-mdsubrange-count-missing.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: [[@LINE+1]]:32: error: missing required field 'count' -!0 = !MDSubrange(lowerBound: -3) +!0 = !DISubrange(lowerBound: -3) diff --git a/llvm/test/Assembler/invalid-mdsubrange-count-negative.ll b/llvm/test/Assembler/invalid-mdsubrange-count-negative.ll index 9bfe784ab5d..f2ad4c302cb 100644 --- a/llvm/test/Assembler/invalid-mdsubrange-count-negative.ll +++ b/llvm/test/Assembler/invalid-mdsubrange-count-negative.ll @@ -1,7 +1,7 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK-NOT: error: -!0 = !MDSubrange(count: -1) +!0 = !DISubrange(count: -1) ; CHECK: <stdin>:[[@LINE+1]]:25: error: value for 'count' too small, limit is -1 -!0 = !MDSubrange(count: -2) +!0 = !DISubrange(count: -2) diff --git a/llvm/test/Assembler/invalid-mdsubrange-lowerBound-max.ll b/llvm/test/Assembler/invalid-mdsubrange-lowerBound-max.ll index 1c68e984b17..e163dc47804 100644 --- a/llvm/test/Assembler/invalid-mdsubrange-lowerBound-max.ll +++ b/llvm/test/Assembler/invalid-mdsubrange-lowerBound-max.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: [[@LINE+1]]:41: error: value for 'lowerBound' too large, limit is 9223372036854775807 -!0 = !MDSubrange(count: 30, lowerBound: 9223372036854775808) +!0 = !DISubrange(count: 30, lowerBound: 9223372036854775808) diff --git a/llvm/test/Assembler/invalid-mdsubrange-lowerBound-min.ll b/llvm/test/Assembler/invalid-mdsubrange-lowerBound-min.ll index b3b2a03efd8..1dc3a141a57 100644 --- a/llvm/test/Assembler/invalid-mdsubrange-lowerBound-min.ll +++ b/llvm/test/Assembler/invalid-mdsubrange-lowerBound-min.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: [[@LINE+1]]:41: error: value for 'lowerBound' too small, limit is -9223372036854775808 -!0 = !MDSubrange(count: 30, lowerBound: -9223372036854775809) +!0 = !DISubrange(count: 30, lowerBound: -9223372036854775809) diff --git a/llvm/test/Assembler/invalid-mdsubroutinetype-missing-types.ll b/llvm/test/Assembler/invalid-mdsubroutinetype-missing-types.ll index 7342417d1ca..086e5cc593e 100644 --- a/llvm/test/Assembler/invalid-mdsubroutinetype-missing-types.ll +++ b/llvm/test/Assembler/invalid-mdsubroutinetype-missing-types.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: [[@LINE+1]]:65: error: missing required field 'types' -!29 = !MDSubroutineType(flags: DIFlagPublic | DIFlagStaticMember) +!29 = !DISubroutineType(flags: DIFlagPublic | DIFlagStaticMember) diff --git a/llvm/test/Assembler/invalid-mdtemplatetypeparameter-missing-type.ll b/llvm/test/Assembler/invalid-mdtemplatetypeparameter-missing-type.ll index 62bee70d947..797abd2c304 100644 --- a/llvm/test/Assembler/invalid-mdtemplatetypeparameter-missing-type.ll +++ b/llvm/test/Assembler/invalid-mdtemplatetypeparameter-missing-type.ll @@ -1,4 +1,4 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: [[@LINE+1]]:44: error: missing required field 'type' -!0 = !MDTemplateTypeParameter(name: "param") +!0 = !DITemplateTypeParameter(name: "param") diff --git a/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-value.ll b/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-value.ll index e1e3f81d269..883bea1c9ad 100644 --- a/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-value.ll +++ b/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-value.ll @@ -1,5 +1,5 @@ ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s ; CHECK: [[@LINE+2]]:41: error: missing required field 'value' -!0 = !MDTemplateValueParameter(tag: DW_TAG_template_value_parameter, +!0 = !DITemplateValueParameter(tag: DW_TAG_template_value_parameter, type: !{}) diff --git a/llvm/test/Assembler/mdcompileunit.ll b/llvm/test/Assembler/mdcompileunit.ll index ce0052367f4..9445c80e76b 100644 --- a/llvm/test/Assembler/mdcompileunit.ll +++ b/llvm/test/Assembler/mdcompileunit.ll @@ -5,27 +5,27 @@ !named = !{!0, !1, !2, !3, !4, !5, !6, !7, !8, !9, !10} !0 = distinct !{} -!1 = !MDFile(filename: "path/to/file", directory: "/path/to/dir") +!1 = !DIFile(filename: "path/to/file", directory: "/path/to/dir") !2 = distinct !{} !3 = distinct !{} !4 = distinct !{} !5 = distinct !{} !6 = distinct !{} -; CHECK: !7 = !MDCompileUnit(language: DW_LANG_C99, file: !1, producer: "clang", isOptimized: true, flags: "-O2", runtimeVersion: 2, splitDebugFilename: "abc.debug", emissionKind: 3, enums: !2, retainedTypes: !3, subprograms: !4, globals: !5, imports: !6) -!7 = !MDCompileUnit(language: DW_LANG_C99, file: !1, producer: "clang", +; CHECK: !7 = !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang", isOptimized: true, flags: "-O2", runtimeVersion: 2, splitDebugFilename: "abc.debug", emissionKind: 3, enums: !2, retainedTypes: !3, subprograms: !4, globals: !5, imports: !6) +!7 = !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang", isOptimized: true, flags: "-O2", runtimeVersion: 2, splitDebugFilename: "abc.debug", emissionKind: 3, enums: !2, retainedTypes: !3, subprograms: !4, globals: !5, imports: !6) -!8 = !MDCompileUnit(language: 12, file: !1, producer: "clang", +!8 = !DICompileUnit(language: 12, file: !1, producer: "clang", isOptimized: true, flags: "-O2", runtimeVersion: 2, splitDebugFilename: "abc.debug", emissionKind: 3, enums: !2, retainedTypes: !3, subprograms: !4, globals: !5, imports: !6) -; CHECK: !8 = !MDCompileUnit(language: DW_LANG_C99, file: !1, isOptimized: false, runtimeVersion: 0, emissionKind: 0) -!9 = !MDCompileUnit(language: 12, file: !1, producer: "", +; CHECK: !8 = !DICompileUnit(language: DW_LANG_C99, file: !1, isOptimized: false, runtimeVersion: 0, emissionKind: 0) +!9 = !DICompileUnit(language: 12, file: !1, producer: "", isOptimized: false, flags: "", runtimeVersion: 0, splitDebugFilename: "", emissionKind: 0) -!10 = !MDCompileUnit(language: 12, file: !1) +!10 = !DICompileUnit(language: 12, file: !1) diff --git a/llvm/test/Assembler/mdexpression.ll b/llvm/test/Assembler/mdexpression.ll index 42bbfe02d67..31be86cef2d 100644 --- a/llvm/test/Assembler/mdexpression.ll +++ b/llvm/test/Assembler/mdexpression.ll @@ -4,13 +4,13 @@ ; CHECK: !named = !{!0, !1, !2, !3, !4} !named = !{!0, !1, !2, !3, !4} -; CHECK: !0 = !MDExpression() -; CHECK-NEXT: !1 = !MDExpression(DW_OP_deref) -; CHECK-NEXT: !2 = !MDExpression(DW_OP_plus, 3) -; CHECK-NEXT: !3 = !MDExpression(DW_OP_bit_piece, 3, 7) -; CHECK-NEXT: !4 = !MDExpression(DW_OP_deref, DW_OP_plus, 3, DW_OP_bit_piece, 3, 7) -!0 = !MDExpression() -!1 = !MDExpression(DW_OP_deref) -!2 = !MDExpression(DW_OP_plus, 3) -!3 = !MDExpression(DW_OP_bit_piece, 3, 7) -!4 = !MDExpression(DW_OP_deref, DW_OP_plus, 3, DW_OP_bit_piece, 3, 7) +; CHECK: !0 = !DIExpression() +; CHECK-NEXT: !1 = !DIExpression(DW_OP_deref) +; CHECK-NEXT: !2 = !DIExpression(DW_OP_plus, 3) +; CHECK-NEXT: !3 = !DIExpression(DW_OP_bit_piece, 3, 7) +; CHECK-NEXT: !4 = !DIExpression(DW_OP_deref, DW_OP_plus, 3, DW_OP_bit_piece, 3, 7) +!0 = !DIExpression() +!1 = !DIExpression(DW_OP_deref) +!2 = !DIExpression(DW_OP_plus, 3) +!3 = !DIExpression(DW_OP_bit_piece, 3, 7) +!4 = !DIExpression(DW_OP_deref, DW_OP_plus, 3, DW_OP_bit_piece, 3, 7) diff --git a/llvm/test/Assembler/mdfile-escaped-chars.ll b/llvm/test/Assembler/mdfile-escaped-chars.ll index 5dfd12caf9c..5900fdca061 100644 --- a/llvm/test/Assembler/mdfile-escaped-chars.ll +++ b/llvm/test/Assembler/mdfile-escaped-chars.ll @@ -5,5 +5,5 @@ !named = !{!0} -; CHECK: !0 = !MDFile(filename: "\00\01\02\80\81\82\FD\FE\FF", directory: "/dir") -!0 = !MDFile(filename: "\00\01\02\80\81\82\FD\FE\FF", directory: "/dir") +; CHECK: !0 = !DIFile(filename: "\00\01\02\80\81\82\FD\FE\FF", directory: "/dir") +!0 = !DIFile(filename: "\00\01\02\80\81\82\FD\FE\FF", directory: "/dir") diff --git a/llvm/test/Assembler/mdglobalvariable.ll b/llvm/test/Assembler/mdglobalvariable.ll index 2726f4f3510..0d027d310f6 100644 --- a/llvm/test/Assembler/mdglobalvariable.ll +++ b/llvm/test/Assembler/mdglobalvariable.ll @@ -6,22 +6,22 @@ ; CHECK: !named = !{!0, !1, !2, !3, !4, !5, !6, !7, !8, !9} !named = !{!0, !1, !2, !3, !4, !5, !6, !7, !8, !9} -!0 = !MDFile(filename: "scope.h", directory: "/path/to/dir") +!0 = !DIFile(filename: "scope.h", directory: "/path/to/dir") !1 = distinct !{} -!2 = !MDFile(filename: "path/to/file", directory: "/path/to/dir") -!3 = !MDBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) +!2 = !DIFile(filename: "path/to/file", directory: "/path/to/dir") +!3 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !4 = distinct !{} -; CHECK: !5 = !MDGlobalVariable(name: "foo", linkageName: "foo", scope: !0, file: !2, line: 7, type: !3, isLocal: true, isDefinition: false, variable: i32* @foo) -!5 = !MDGlobalVariable(name: "foo", linkageName: "foo", scope: !0, +; CHECK: !5 = !DIGlobalVariable(name: "foo", linkageName: "foo", scope: !0, file: !2, line: 7, type: !3, isLocal: true, isDefinition: false, variable: i32* @foo) +!5 = !DIGlobalVariable(name: "foo", linkageName: "foo", scope: !0, file: !2, line: 7, type: !3, isLocal: true, isDefinition: false, variable: i32* @foo) -; CHECK: !6 = !MDGlobalVariable(name: "foo", scope: !0, isLocal: false, isDefinition: true) -!6 = !MDGlobalVariable(name: "foo", scope: !0) +; CHECK: !6 = !DIGlobalVariable(name: "foo", scope: !0, isLocal: false, isDefinition: true) +!6 = !DIGlobalVariable(name: "foo", scope: !0) -!7 = !MDCompositeType(tag: DW_TAG_structure_type, name: "Class", size: 8, align: 8) -!8 = !MDDerivedType(tag: DW_TAG_member, name: "mem", flags: DIFlagStaticMember, scope: !7, baseType: !3) +!7 = !DICompositeType(tag: DW_TAG_structure_type, name: "Class", size: 8, align: 8) +!8 = !DIDerivedType(tag: DW_TAG_member, name: "mem", flags: DIFlagStaticMember, scope: !7, baseType: !3) -; CHECK: !9 = !MDGlobalVariable(name: "mem", scope: !0, isLocal: false, isDefinition: true, declaration: !8) -!9 = !MDGlobalVariable(name: "mem", scope: !0, declaration: !8) +; CHECK: !9 = !DIGlobalVariable(name: "mem", scope: !0, isLocal: false, isDefinition: true, declaration: !8) +!9 = !DIGlobalVariable(name: "mem", scope: !0, declaration: !8) diff --git a/llvm/test/Assembler/mdimportedentity.ll b/llvm/test/Assembler/mdimportedentity.ll index 8e98c5de212..929267e3b25 100644 --- a/llvm/test/Assembler/mdimportedentity.ll +++ b/llvm/test/Assembler/mdimportedentity.ll @@ -4,17 +4,17 @@ ; CHECK: !named = !{!0, !1, !2, !3, !3} !named = !{!0, !1, !2, !3, !4} -; CHECK: !0 = !MDSubprogram({{.*}}) -; CHECK-NEXT: !1 = !MDCompositeType({{.*}}) -!0 = !MDSubprogram(name: "foo") -!1 = !MDCompositeType(tag: DW_TAG_structure_type, name: "Class", size: 32, align: 32) +; CHECK: !0 = !DISubprogram({{.*}}) +; CHECK-NEXT: !1 = !DICompositeType({{.*}}) +!0 = !DISubprogram(name: "foo") +!1 = !DICompositeType(tag: DW_TAG_structure_type, name: "Class", size: 32, align: 32) -; CHECK-NEXT: !2 = !MDImportedEntity(tag: DW_TAG_imported_module, name: "foo", scope: !0, entity: !1, line: 7) -!2 = !MDImportedEntity(tag: DW_TAG_imported_module, name: "foo", scope: !0, +; CHECK-NEXT: !2 = !DIImportedEntity(tag: DW_TAG_imported_module, name: "foo", scope: !0, entity: !1, line: 7) +!2 = !DIImportedEntity(tag: DW_TAG_imported_module, name: "foo", scope: !0, entity: !1, line: 7) -; CHECK-NEXT: !3 = !MDImportedEntity(tag: DW_TAG_imported_module, scope: !0) -!3 = !MDImportedEntity(tag: DW_TAG_imported_module, scope: !0) -!4 = !MDImportedEntity(tag: DW_TAG_imported_module, name: "", scope: !0, entity: null, +; CHECK-NEXT: !3 = !DIImportedEntity(tag: DW_TAG_imported_module, scope: !0) +!3 = !DIImportedEntity(tag: DW_TAG_imported_module, scope: !0) +!4 = !DIImportedEntity(tag: DW_TAG_imported_module, name: "", scope: !0, entity: null, line: 0) diff --git a/llvm/test/Assembler/mdlexicalblock.ll b/llvm/test/Assembler/mdlexicalblock.ll index d88eae747ac..2cab372384c 100644 --- a/llvm/test/Assembler/mdlexicalblock.ll +++ b/llvm/test/Assembler/mdlexicalblock.ll @@ -5,21 +5,21 @@ !named = !{!0, !1, !2, !3, !4, !5, !6, !7, !8, !9} !0 = distinct !{} -!1 = !MDSubprogram(name: "foo", scope: !2) -!2 = !MDFile(filename: "path/to/file", directory: "/path/to/dir") +!1 = !DISubprogram(name: "foo", scope: !2) +!2 = !DIFile(filename: "path/to/file", directory: "/path/to/dir") -; CHECK: !3 = !MDLexicalBlock(scope: !1, file: !2, line: 7, column: 35) -!3 = !MDLexicalBlock(scope: !1, file: !2, line: 7, column: 35) +; CHECK: !3 = !DILexicalBlock(scope: !1, file: !2, line: 7, column: 35) +!3 = !DILexicalBlock(scope: !1, file: !2, line: 7, column: 35) -; CHECK: !4 = !MDLexicalBlock(scope: !1) -!4 = !MDLexicalBlock(scope: !1) -!5 = !MDLexicalBlock(scope: !1, file: null, line: 0, column: 0) +; CHECK: !4 = !DILexicalBlock(scope: !1) +!4 = !DILexicalBlock(scope: !1) +!5 = !DILexicalBlock(scope: !1, file: null, line: 0, column: 0) -; CHECK: !5 = !MDLexicalBlockFile(scope: !3, file: !2, discriminator: 0) -; CHECK: !6 = !MDLexicalBlockFile(scope: !3, file: !2, discriminator: 1) -!6 = !MDLexicalBlockFile(scope: !3, file: !2, discriminator: 0) -!7 = !MDLexicalBlockFile(scope: !3, file: !2, discriminator: 1) +; CHECK: !5 = !DILexicalBlockFile(scope: !3, file: !2, discriminator: 0) +; CHECK: !6 = !DILexicalBlockFile(scope: !3, file: !2, discriminator: 1) +!6 = !DILexicalBlockFile(scope: !3, file: !2, discriminator: 0) +!7 = !DILexicalBlockFile(scope: !3, file: !2, discriminator: 1) -; CHECK: !7 = !MDLexicalBlockFile(scope: !3, discriminator: 7) -!8 = !MDLexicalBlockFile(scope: !3, discriminator: 7) -!9 = !MDLexicalBlockFile(scope: !3, file: null, discriminator: 7) +; CHECK: !7 = !DILexicalBlockFile(scope: !3, discriminator: 7) +!8 = !DILexicalBlockFile(scope: !3, discriminator: 7) +!9 = !DILexicalBlockFile(scope: !3, file: null, discriminator: 7) diff --git a/llvm/test/Assembler/mdlocalvariable.ll b/llvm/test/Assembler/mdlocalvariable.ll index 2c0b35a3a57..312373ca862 100644 --- a/llvm/test/Assembler/mdlocalvariable.ll +++ b/llvm/test/Assembler/mdlocalvariable.ll @@ -6,21 +6,21 @@ ; CHECK: !named = !{!0, !1, !2, !3, !4, !5, !6, !7, !8} !named = !{!0, !1, !2, !3, !4, !5, !6, !7, !8} -!0 = distinct !MDSubprogram() +!0 = distinct !DISubprogram() !1 = distinct !{} -!2 = !MDFile(filename: "path/to/file", directory: "/path/to/dir") -!3 = !MDBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -!4 = !MDLocation(scope: !0) +!2 = !DIFile(filename: "path/to/file", directory: "/path/to/dir") +!3 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) +!4 = !DILocation(scope: !0) -; CHECK: !5 = !MDLocalVariable(tag: DW_TAG_arg_variable, name: "foo", arg: 3, scope: !0, file: !2, line: 7, type: !3, flags: DIFlagArtificial) -; CHECK: !6 = !MDLocalVariable(tag: DW_TAG_auto_variable, name: "foo", scope: !0, file: !2, line: 7, type: !3, flags: DIFlagArtificial) -!5 = !MDLocalVariable(tag: DW_TAG_arg_variable, name: "foo", arg: 3, +; CHECK: !5 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "foo", arg: 3, scope: !0, file: !2, line: 7, type: !3, flags: DIFlagArtificial) +; CHECK: !6 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "foo", scope: !0, file: !2, line: 7, type: !3, flags: DIFlagArtificial) +!5 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "foo", arg: 3, scope: !0, file: !2, line: 7, type: !3, flags: DIFlagArtificial) -!6 = !MDLocalVariable(tag: DW_TAG_auto_variable, name: "foo", scope: !0, +!6 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "foo", scope: !0, file: !2, line: 7, type: !3, flags: DIFlagArtificial) -; CHECK: !7 = !MDLocalVariable(tag: DW_TAG_arg_variable, arg: 0, scope: !0) -; CHECK: !8 = !MDLocalVariable(tag: DW_TAG_auto_variable, scope: !0) -!7 = !MDLocalVariable(tag: DW_TAG_arg_variable, scope: !0) -!8 = !MDLocalVariable(tag: DW_TAG_auto_variable, scope: !0) +; CHECK: !7 = !DILocalVariable(tag: DW_TAG_arg_variable, arg: 0, scope: !0) +; CHECK: !8 = !DILocalVariable(tag: DW_TAG_auto_variable, scope: !0) +!7 = !DILocalVariable(tag: DW_TAG_arg_variable, scope: !0) +!8 = !DILocalVariable(tag: DW_TAG_auto_variable, scope: !0) diff --git a/llvm/test/Assembler/mdlocation.ll b/llvm/test/Assembler/mdlocation.ll index 47e6e983d42..a468f8abe9c 100644 --- a/llvm/test/Assembler/mdlocation.ll +++ b/llvm/test/Assembler/mdlocation.ll @@ -4,20 +4,20 @@ ; CHECK: !named = !{!0, !1, !1, !2, !2, !3, !3, !4} !named = !{!0, !1, !2, !3, !4, !5, !6, !7} -; CHECK: !0 = !MDSubprogram( -!0 = !MDSubprogram() +; CHECK: !0 = !DISubprogram( +!0 = !DISubprogram() -; CHECK-NEXT: !1 = !MDLocation(line: 3, column: 7, scope: !0) -!1 = !MDLocation(line: 3, column: 7, scope: !0) -!2 = !MDLocation(scope: !0, column: 7, line: 3) +; CHECK-NEXT: !1 = !DILocation(line: 3, column: 7, scope: !0) +!1 = !DILocation(line: 3, column: 7, scope: !0) +!2 = !DILocation(scope: !0, column: 7, line: 3) -; CHECK-NEXT: !2 = !MDLocation(line: 3, column: 7, scope: !0, inlinedAt: !1) -!3 = !MDLocation(scope: !0, inlinedAt: !1, column: 7, line: 3) -!4 = !MDLocation(column: 7, line: 3, scope: !0, inlinedAt: !1) +; CHECK-NEXT: !2 = !DILocation(line: 3, column: 7, scope: !0, inlinedAt: !1) +!3 = !DILocation(scope: !0, inlinedAt: !1, column: 7, line: 3) +!4 = !DILocation(column: 7, line: 3, scope: !0, inlinedAt: !1) -; CHECK-NEXT: !3 = !MDLocation(line: 0, scope: !0) -!5 = !MDLocation(scope: !0) -!6 = !MDLocation(scope: !0, column: 0, line: 0) +; CHECK-NEXT: !3 = !DILocation(line: 0, scope: !0) +!5 = !DILocation(scope: !0) +!6 = !DILocation(scope: !0, column: 0, line: 0) -; CHECK-NEXT: !4 = !MDLocation(line: 4294967295, column: 65535, scope: !0) -!7 = !MDLocation(line: 4294967295, column: 65535, scope: !0) +; CHECK-NEXT: !4 = !DILocation(line: 4294967295, column: 65535, scope: !0) +!7 = !DILocation(line: 4294967295, column: 65535, scope: !0) diff --git a/llvm/test/Assembler/mdnamespace.ll b/llvm/test/Assembler/mdnamespace.ll index e708a3c5faf..5d8b6b3fa7d 100644 --- a/llvm/test/Assembler/mdnamespace.ll +++ b/llvm/test/Assembler/mdnamespace.ll @@ -4,13 +4,13 @@ ; CHECK: !named = !{!0, !1, !2, !3, !4, !4} !named = !{!0, !1, !2, !3, !4, !5} -!0 = !MDFile(filename: "file.cpp", directory: "/path/to/dir") +!0 = !DIFile(filename: "file.cpp", directory: "/path/to/dir") !1 = distinct !{} -!2 = !MDFile(filename: "path/to/file", directory: "/path/to/dir") +!2 = !DIFile(filename: "path/to/file", directory: "/path/to/dir") -; CHECK: !3 = !MDNamespace(name: "Namespace", scope: !0, file: !2, line: 7) -!3 = !MDNamespace(name: "Namespace", scope: !0, file: !2, line: 7) +; CHECK: !3 = !DINamespace(name: "Namespace", scope: !0, file: !2, line: 7) +!3 = !DINamespace(name: "Namespace", scope: !0, file: !2, line: 7) -; CHECK: !4 = !MDNamespace(scope: !0) -!4 = !MDNamespace(name: "", scope: !0, file: null, line: 0) -!5 = !MDNamespace(scope: !0) +; CHECK: !4 = !DINamespace(scope: !0) +!4 = !DINamespace(name: "", scope: !0, file: null, line: 0) +!5 = !DINamespace(scope: !0) diff --git a/llvm/test/Assembler/mdobjcproperty.ll b/llvm/test/Assembler/mdobjcproperty.ll index a3b20e5d99d..ca13e27662d 100644 --- a/llvm/test/Assembler/mdobjcproperty.ll +++ b/llvm/test/Assembler/mdobjcproperty.ll @@ -5,15 +5,15 @@ !named = !{!0, !1, !2, !3, !4, !5} !0 = distinct !{} -!1 = !MDFile(filename: "path/to/file", directory: "/path/to/dir") -!2 = !MDCompositeType(tag: DW_TAG_structure_type, name: "Object") +!1 = !DIFile(filename: "path/to/file", directory: "/path/to/dir") +!2 = !DICompositeType(tag: DW_TAG_structure_type, name: "Object") -; CHECK: !2 = !MDCompositeType({{.*}}) -; CHECK-NEXT: !3 = !MDObjCProperty(name: "foo", file: !1, line: 7, setter: "setFoo", getter: "getFoo", attributes: 7, type: !2) -!3 = !MDObjCProperty(name: "foo", file: !1, line: 7, setter: "setFoo", +; CHECK: !2 = !DICompositeType({{.*}}) +; CHECK-NEXT: !3 = !DIObjCProperty(name: "foo", file: !1, line: 7, setter: "setFoo", getter: "getFoo", attributes: 7, type: !2) +!3 = !DIObjCProperty(name: "foo", file: !1, line: 7, setter: "setFoo", getter: "getFoo", attributes: 7, type: !2) -; CHECK-NEXT: !4 = !MDObjCProperty() -!4 = !MDObjCProperty(name: "", file: null, line: 0, setter: "", getter: "", +; CHECK-NEXT: !4 = !DIObjCProperty() +!4 = !DIObjCProperty(name: "", file: null, line: 0, setter: "", getter: "", attributes: 0, type: null) -!5 = !MDObjCProperty() +!5 = !DIObjCProperty() diff --git a/llvm/test/Assembler/mdsubprogram.ll b/llvm/test/Assembler/mdsubprogram.ll index 93000893c16..3fa1081889f 100644 --- a/llvm/test/Assembler/mdsubprogram.ll +++ b/llvm/test/Assembler/mdsubprogram.ll @@ -7,22 +7,22 @@ declare void @_Z3foov() !named = !{!0, !1, !2, !3, !4, !5, !6, !7, !8, !9} !0 = !{null} -!1 = distinct !MDCompositeType(tag: DW_TAG_structure_type) -!2 = !MDFile(filename: "path/to/file", directory: "/path/to/dir") -!3 = !MDSubroutineType(types: !0) -!4 = distinct !MDCompositeType(tag: DW_TAG_structure_type) +!1 = distinct !DICompositeType(tag: DW_TAG_structure_type) +!2 = !DIFile(filename: "path/to/file", directory: "/path/to/dir") +!3 = !DISubroutineType(types: !0) +!4 = distinct !DICompositeType(tag: DW_TAG_structure_type) !5 = distinct !{} -!6 = distinct !MDSubprogram(isDefinition: false) +!6 = distinct !DISubprogram(isDefinition: false) !7 = distinct !{} -; CHECK: !8 = !MDSubprogram(name: "foo", linkageName: "_Zfoov", scope: !1, file: !2, line: 7, type: !3, isLocal: true, isDefinition: false, scopeLine: 8, containingType: !4, virtuality: DW_VIRTUALITY_pure_virtual, virtualIndex: 10, flags: DIFlagPrototyped, isOptimized: true, function: void ()* @_Z3foov, templateParams: !5, declaration: !6, variables: !7) -!8 = !MDSubprogram(name: "foo", linkageName: "_Zfoov", scope: !1, +; CHECK: !8 = !DISubprogram(name: "foo", linkageName: "_Zfoov", scope: !1, file: !2, line: 7, type: !3, isLocal: true, isDefinition: false, scopeLine: 8, containingType: !4, virtuality: DW_VIRTUALITY_pure_virtual, virtualIndex: 10, flags: DIFlagPrototyped, isOptimized: true, function: void ()* @_Z3foov, templateParams: !5, declaration: !6, variables: !7) +!8 = !DISubprogram(name: "foo", linkageName: "_Zfoov", scope: !1, file: !2, line: 7, type: !3, isLocal: true, isDefinition: false, scopeLine: 8, containingType: !4, virtuality: DW_VIRTUALITY_pure_virtual, virtualIndex: 10, flags: DIFlagPrototyped, isOptimized: true, function: void ()* @_Z3foov, templateParams: !5, declaration: !6, variables: !7) -; CHECK: !9 = !MDSubprogram(scope: null, isLocal: false, isDefinition: true, isOptimized: false) -!9 = !MDSubprogram() +; CHECK: !9 = !DISubprogram(scope: null, isLocal: false, isDefinition: true, isOptimized: false) +!9 = !DISubprogram() diff --git a/llvm/test/Assembler/mdsubrange-empty-array.ll b/llvm/test/Assembler/mdsubrange-empty-array.ll index fa05582a9a9..7b5279e3d3c 100644 --- a/llvm/test/Assembler/mdsubrange-empty-array.ll +++ b/llvm/test/Assembler/mdsubrange-empty-array.ll @@ -4,11 +4,11 @@ ; CHECK: !named = !{!0, !0, !1, !2} !named = !{!0, !1, !2, !3} -; CHECK: !0 = !MDSubrange(count: -1) -; CHECK-NEXT: !1 = !MDSubrange(count: -1, lowerBound: 4) -; CHECK-NEXT: !2 = !MDSubrange(count: -1, lowerBound: -5) -!0 = !MDSubrange(count: -1) -!1 = !MDSubrange(count: -1, lowerBound: 0) +; CHECK: !0 = !DISubrange(count: -1) +; CHECK-NEXT: !1 = !DISubrange(count: -1, lowerBound: 4) +; CHECK-NEXT: !2 = !DISubrange(count: -1, lowerBound: -5) +!0 = !DISubrange(count: -1) +!1 = !DISubrange(count: -1, lowerBound: 0) -!2 = !MDSubrange(count: -1, lowerBound: 4) -!3 = !MDSubrange(count: -1, lowerBound: -5) +!2 = !DISubrange(count: -1, lowerBound: 4) +!3 = !DISubrange(count: -1, lowerBound: -5) diff --git a/llvm/test/Assembler/mdsubroutinetype.ll b/llvm/test/Assembler/mdsubroutinetype.ll index 936cbf4ec7b..4ec2be7de3b 100644 --- a/llvm/test/Assembler/mdsubroutinetype.ll +++ b/llvm/test/Assembler/mdsubroutinetype.ll @@ -4,20 +4,20 @@ ; CHECK: !named = !{!0, !1, !2, !3, !4, !5, !6, !7, !8} !named = !{!0, !1, !2, !3, !4, !5, !6, !7, !8} -!0 = !MDBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) +!0 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !1 = !{null} !2 = !{null, !0} !3 = !{!0, !0, !0} -; CHECK: !4 = !MDSubroutineType(types: !1) -; CHECK: !5 = !MDSubroutineType(types: !2) -; CHECK: !6 = !MDSubroutineType(types: !3) -; CHECK: !7 = !MDSubroutineType(flags: DIFlagLValueReference, types: !3) -!4 = !MDSubroutineType(types: !1) -!5 = !MDSubroutineType(types: !2) -!6 = !MDSubroutineType(types: !3) -!7 = !MDSubroutineType(flags: DIFlagLValueReference, types: !3) +; CHECK: !4 = !DISubroutineType(types: !1) +; CHECK: !5 = !DISubroutineType(types: !2) +; CHECK: !6 = !DISubroutineType(types: !3) +; CHECK: !7 = !DISubroutineType(flags: DIFlagLValueReference, types: !3) +!4 = !DISubroutineType(types: !1) +!5 = !DISubroutineType(types: !2) +!6 = !DISubroutineType(types: !3) +!7 = !DISubroutineType(flags: DIFlagLValueReference, types: !3) -; CHECK: !8 = !MDSubroutineType(types: null) -!8 = !MDSubroutineType(types: null) +; CHECK: !8 = !DISubroutineType(types: null) +!8 = !DISubroutineType(types: null) diff --git a/llvm/test/Assembler/mdtemplateparameter.ll b/llvm/test/Assembler/mdtemplateparameter.ll index 5bcef3f21e9..a356ad4e7bc 100644 --- a/llvm/test/Assembler/mdtemplateparameter.ll +++ b/llvm/test/Assembler/mdtemplateparameter.ll @@ -5,20 +5,20 @@ !named = !{!0, !1, !2, !3, !4, !5, !6, !7, !8} !0 = distinct !{} -!1 = !MDBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -; CHECK: !1 = !MDBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) +!1 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) +; CHECK: !1 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -; CHECK-NEXT: !2 = !MDTemplateTypeParameter(name: "Ty", type: !1) -; CHECK-NEXT: !3 = !MDTemplateTypeParameter(type: !1) -!2 = !MDTemplateTypeParameter(name: "Ty", type: !1) -!3 = !MDTemplateTypeParameter(type: !1) -!4 = !MDTemplateTypeParameter(name: "", type: !1) +; CHECK-NEXT: !2 = !DITemplateTypeParameter(name: "Ty", type: !1) +; CHECK-NEXT: !3 = !DITemplateTypeParameter(type: !1) +!2 = !DITemplateTypeParameter(name: "Ty", type: !1) +!3 = !DITemplateTypeParameter(type: !1) +!4 = !DITemplateTypeParameter(name: "", type: !1) -; CHECK-NEXT: !4 = !MDTemplateValueParameter(name: "V", type: !1, value: i32 7) -; CHECK-NEXT: !5 = !MDTemplateValueParameter(type: !1, value: i32 7) -; CHECK-NEXT: !6 = !MDTemplateValueParameter(tag: DW_TAG_GNU_template_template_param, name: "param", type: !1, value: !"template") -!5 = !MDTemplateValueParameter(name: "V", type: !1, value: i32 7) -!6 = !MDTemplateValueParameter(type: !1, value: i32 7) -!7 = !MDTemplateValueParameter(tag: DW_TAG_template_value_parameter, +; CHECK-NEXT: !4 = !DITemplateValueParameter(name: "V", type: !1, value: i32 7) +; CHECK-NEXT: !5 = !DITemplateValueParameter(type: !1, value: i32 7) +; CHECK-NEXT: !6 = !DITemplateValueParameter(tag: DW_TAG_GNU_template_template_param, name: "param", type: !1, value: !"template") +!5 = !DITemplateValueParameter(name: "V", type: !1, value: i32 7) +!6 = !DITemplateValueParameter(type: !1, value: i32 7) +!7 = !DITemplateValueParameter(tag: DW_TAG_template_value_parameter, name: "", type: !1, value: i32 7) -!8 = !MDTemplateValueParameter(tag: DW_TAG_GNU_template_template_param, name: "param", type: !1, value: !"template") +!8 = !DITemplateValueParameter(tag: DW_TAG_GNU_template_template_param, name: "param", type: !1, value: !"template") diff --git a/llvm/test/Assembler/mdtype-large-values.ll b/llvm/test/Assembler/mdtype-large-values.ll index b2b0a87abb8..a371ac68f90 100644 --- a/llvm/test/Assembler/mdtype-large-values.ll +++ b/llvm/test/Assembler/mdtype-large-values.ll @@ -4,9 +4,9 @@ ; CHECK: !named = !{!0, !1, !2} !named = !{!0, !1, !2} -; CHECK: !0 = !MDBasicType(name: "name", size: 18446744073709551615, align: 18446744073709551614, encoding: DW_ATE_unsigned_char) -; CHECK-NEXT: !1 = !MDDerivedType(tag: DW_TAG_pointer_type, baseType: !0, size: 18446744073709551615, align: 18446744073709551614, offset: 18446744073709551613) -; CHECK-NEXT: !2 = !MDCompositeType(tag: DW_TAG_array_type, baseType: !0, size: 18446744073709551615, align: 18446744073709551614, offset: 18446744073709551613) -!0 = !MDBasicType(tag: DW_TAG_base_type, name: "name", size: 18446744073709551615, align: 18446744073709551614, encoding: DW_ATE_unsigned_char) -!1 = !MDDerivedType(tag: DW_TAG_pointer_type, baseType: !0, size: 18446744073709551615, align: 18446744073709551614, offset: 18446744073709551613) -!2 = !MDCompositeType(tag: DW_TAG_array_type, baseType: !0, size: 18446744073709551615, align: 18446744073709551614, offset: 18446744073709551613) +; CHECK: !0 = !DIBasicType(name: "name", size: 18446744073709551615, align: 18446744073709551614, encoding: DW_ATE_unsigned_char) +; CHECK-NEXT: !1 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !0, size: 18446744073709551615, align: 18446744073709551614, offset: 18446744073709551613) +; CHECK-NEXT: !2 = !DICompositeType(tag: DW_TAG_array_type, baseType: !0, size: 18446744073709551615, align: 18446744073709551614, offset: 18446744073709551613) +!0 = !DIBasicType(tag: DW_TAG_base_type, name: "name", size: 18446744073709551615, align: 18446744073709551614, encoding: DW_ATE_unsigned_char) +!1 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !0, size: 18446744073709551615, align: 18446744073709551614, offset: 18446744073709551613) +!2 = !DICompositeType(tag: DW_TAG_array_type, baseType: !0, size: 18446744073709551615, align: 18446744073709551614, offset: 18446744073709551613) diff --git a/llvm/test/Assembler/metadata-null-operands.ll b/llvm/test/Assembler/metadata-null-operands.ll index 7e27eba45fe..2d013d0e912 100644 --- a/llvm/test/Assembler/metadata-null-operands.ll +++ b/llvm/test/Assembler/metadata-null-operands.ll @@ -5,7 +5,7 @@ ; require non-null in the assembler and rework this test to check for that ala ; test/Assembler/invalid-mdcompileunit-null-file.ll. !named = !{!0} -!0 = !MDDerivedType(tag: DW_TAG_pointer_type, baseType: null) +!0 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null) ; CHECK: !named = !{!0} -; CHECK: !0 = !MDDerivedType({{.*}}baseType: null{{.*}}) +; CHECK: !0 = !DIDerivedType({{.*}}baseType: null{{.*}}) diff --git a/llvm/test/Assembler/metadata.ll b/llvm/test/Assembler/metadata.ll index 21a47ddb734..4fb8851a9f4 100644 --- a/llvm/test/Assembler/metadata.ll +++ b/llvm/test/Assembler/metadata.ll @@ -22,8 +22,8 @@ define void @test3() !bar !3 { unreachable, !bar !4 } -!0 = !MDLocation(line: 662302, column: 26, scope: !1) -!1 = !MDSubprogram(name: "foo") +!0 = !DILocation(line: 662302, column: 26, scope: !1) +!1 = !DISubprogram(name: "foo") !2 = distinct !{} !3 = distinct !{} !4 = distinct !{} |
