diff options
Diffstat (limited to 'clang/test')
140 files changed, 653 insertions, 653 deletions
diff --git a/clang/test/CodeGen/2009-10-20-GlobalDebug.c b/clang/test/CodeGen/2009-10-20-GlobalDebug.c index 44be13ab69b..080f02ea7ed 100644 --- a/clang/test/CodeGen/2009-10-20-GlobalDebug.c +++ b/clang/test/CodeGen/2009-10-20-GlobalDebug.c @@ -6,11 +6,11 @@ int main() { return 0; } -// CHECK: !MDGlobalVariable(name: "localstatic" +// CHECK: !DIGlobalVariable(name: "localstatic" // CHECK-NOT: linkageName: // CHECK-SAME: line: 5, // CHECK-SAME: variable: i32* @main.localstatic -// CHECK: !MDGlobalVariable(name: "global" +// CHECK: !DIGlobalVariable(name: "global" // CHECK-NOT: linkageName: // CHECK-SAME: line: 3, // CHECK-SAME: variable: i32* @global diff --git a/clang/test/CodeGen/2010-02-15-DbgStaticVar.c b/clang/test/CodeGen/2010-02-15-DbgStaticVar.c index 60302d69058..273385a3a94 100644 --- a/clang/test/CodeGen/2010-02-15-DbgStaticVar.c +++ b/clang/test/CodeGen/2010-02-15-DbgStaticVar.c @@ -11,6 +11,6 @@ int main() { int j = foo(1); return 0; } -// CHECK: !MDGlobalVariable(name: "b", +// CHECK: !DIGlobalVariable(name: "b", // CHECK-NOT: linkageName: // CHECK-SAME: ){{$}} diff --git a/clang/test/CodeGen/2010-02-16-DbgScopes.c b/clang/test/CodeGen/2010-02-16-DbgScopes.c index daae53d1c18..3c33bae8b19 100644 --- a/clang/test/CodeGen/2010-02-16-DbgScopes.c +++ b/clang/test/CodeGen/2010-02-16-DbgScopes.c @@ -1,9 +1,9 @@ // RUN: %clang_cc1 -emit-llvm -g < %s | FileCheck %s // Test to check number of lexical scope identified in debug info. -// CHECK: !MDLexicalBlock( -// CHECK: !MDLexicalBlock( -// CHECK: !MDLexicalBlock( -// CHECK: !MDLexicalBlock( +// CHECK: !DILexicalBlock( +// CHECK: !DILexicalBlock( +// CHECK: !DILexicalBlock( +// CHECK: !DILexicalBlock( extern int bar(); extern void foobar(); diff --git a/clang/test/CodeGen/2010-03-09-DbgInfo.c b/clang/test/CodeGen/2010-03-09-DbgInfo.c index 3a98e4cf437..a23250e7b70 100644 --- a/clang/test/CodeGen/2010-03-09-DbgInfo.c +++ b/clang/test/CodeGen/2010-03-09-DbgInfo.c @@ -1,3 +1,3 @@ // RUN: %clang -emit-llvm -S -O0 -g %s -o - | FileCheck %s -// CHECK: !MDGlobalVariable( +// CHECK: !DIGlobalVariable( unsigned char ctable1[1] = { 0001 }; diff --git a/clang/test/CodeGen/2010-03-5-LexicalScope.c b/clang/test/CodeGen/2010-03-5-LexicalScope.c index bec7d84ed6f..007be7684ba 100644 --- a/clang/test/CodeGen/2010-03-5-LexicalScope.c +++ b/clang/test/CodeGen/2010-03-5-LexicalScope.c @@ -1,6 +1,6 @@ // RUN: %clang_cc1 -emit-llvm -g %s -o - | FileCheck %s -// CHECK: !MDLexicalBlock( -// CHECK: !MDLexicalBlock( +// CHECK: !DILexicalBlock( +// CHECK: !DILexicalBlock( int foo(int i) { if (i) { int j = 2; diff --git a/clang/test/CodeGen/2010-07-08-DeclDebugLineNo.c b/clang/test/CodeGen/2010-07-08-DeclDebugLineNo.c index 44c973acda6..386c2c333ac 100644 --- a/clang/test/CodeGen/2010-07-08-DeclDebugLineNo.c +++ b/clang/test/CodeGen/2010-07-08-DeclDebugLineNo.c @@ -6,5 +6,5 @@ void foo() { int p = 0; // line #5: CHECK: {{call.*llvm.dbg.declare.*%p.*\!dbg }}[[variable_p:![0-9]+]] } // Now match the line number records: -// CHECK: {{^}}[[variable_l]] = !MDLocation(line: 5, -// CHECK: {{^}}[[variable_p]] = !MDLocation(line: 6, +// CHECK: {{^}}[[variable_l]] = !DILocation(line: 5, +// CHECK: {{^}}[[variable_p]] = !DILocation(line: 6, diff --git a/clang/test/CodeGen/2010-08-10-DbgConstant.c b/clang/test/CodeGen/2010-08-10-DbgConstant.c index e07a184f596..04956ae0f27 100644 --- a/clang/test/CodeGen/2010-08-10-DbgConstant.c +++ b/clang/test/CodeGen/2010-08-10-DbgConstant.c @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -S -emit-llvm -g %s -o - | FileCheck %s -// CHECK: !MDGlobalVariable( +// CHECK: !DIGlobalVariable( static const unsigned int ro = 201; void bar(int); diff --git a/clang/test/CodeGen/debug-info-257-args.c b/clang/test/CodeGen/debug-info-257-args.c index cc477e4ffb4..c6ffa6e9bfb 100644 --- a/clang/test/CodeGen/debug-info-257-args.c +++ b/clang/test/CodeGen/debug-info-257-args.c @@ -1,9 +1,9 @@ // RUN: %clang_cc1 -x c++ -g -emit-llvm -triple x86_64-linux-gnu -o - %s | FileCheck %s // PR23332 -// CHECK: MDLocalVariable(tag: DW_TAG_arg_variable, arg: 255 -// CHECK: MDLocalVariable(tag: DW_TAG_arg_variable, arg: 256 -// CHECK: MDLocalVariable(tag: DW_TAG_arg_variable, arg: 257 +// CHECK: DILocalVariable(tag: DW_TAG_arg_variable, arg: 255 +// CHECK: DILocalVariable(tag: DW_TAG_arg_variable, arg: 256 +// CHECK: DILocalVariable(tag: DW_TAG_arg_variable, arg: 257 void fn1(int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, diff --git a/clang/test/CodeGen/debug-info-args.c b/clang/test/CodeGen/debug-info-args.c index 9389047c0e7..47c904b9995 100644 --- a/clang/test/CodeGen/debug-info-args.c +++ b/clang/test/CodeGen/debug-info-args.c @@ -2,7 +2,7 @@ int somefunc(char *x, int y, double z) { - // CHECK: !MDSubroutineType(types: ![[NUM:[0-9]+]]) + // CHECK: !DISubroutineType(types: ![[NUM:[0-9]+]]) // CHECK: ![[NUM]] = {{!{![^,]*, ![^,]*, ![^,]*, ![^,]*}}} return y; diff --git a/clang/test/CodeGen/debug-info-block-decl.c b/clang/test/CodeGen/debug-info-block-decl.c index f3f5e6bd0a9..5476d8874bf 100644 --- a/clang/test/CodeGen/debug-info-block-decl.c +++ b/clang/test/CodeGen/debug-info-block-decl.c @@ -9,8 +9,8 @@ int main() { -// CHECK: [[ASSIGNMENT]] = !MDLocation(line: [[@LINE+2]], -// CHECK: [[BLOCK_ENTRY]] = !MDLocation(line: [[@LINE+1]], +// CHECK: [[ASSIGNMENT]] = !DILocation(line: [[@LINE+2]], +// CHECK: [[BLOCK_ENTRY]] = !DILocation(line: [[@LINE+1]], int (^blockptr)(void) = ^(void) { return 0; }; diff --git a/clang/test/CodeGen/debug-info-block-out-return.c b/clang/test/CodeGen/debug-info-block-out-return.c index 282fa4f9f50..e0e5bd91249 100644 --- a/clang/test/CodeGen/debug-info-block-out-return.c +++ b/clang/test/CodeGen/debug-info-block-out-return.c @@ -11,8 +11,8 @@ // out of order or not at all (the latter would occur if they were both assigned // the same argument number by mistake). -// CHECK: !MDLocalVariable(tag: DW_TAG_arg_variable, name: ".block_descriptor", arg: 1,{{.*}}line: 2, -// CHECK: !MDLocalVariable(tag: DW_TAG_arg_variable, name: "param", arg: 2,{{.*}}line: 2, +// CHECK: !DILocalVariable(tag: DW_TAG_arg_variable, name: ".block_descriptor", arg: 1,{{.*}}line: 2, +// CHECK: !DILocalVariable(tag: DW_TAG_arg_variable, name: "param", arg: 2,{{.*}}line: 2, // Line directive so we don't have to worry about how many lines preceed the // test code (as the line number is mangled in with the argument number as shown diff --git a/clang/test/CodeGen/debug-info-block.c b/clang/test/CodeGen/debug-info-block.c index 4b5706b3324..c4930bfc3c8 100644 --- a/clang/test/CodeGen/debug-info-block.c +++ b/clang/test/CodeGen/debug-info-block.c @@ -2,8 +2,8 @@ // Verify that the desired debugging type is generated for a structure // member that is a pointer to a block. -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "__block_literal_generic" -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "__block_descriptor" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "__block_literal_generic" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "__block_descriptor" struct inStruct { void (^genericBlockPtr)(); } is; diff --git a/clang/test/CodeGen/debug-info-enum.c b/clang/test/CodeGen/debug-info-enum.c index e32c7313ee2..4474e4000e9 100644 --- a/clang/test/CodeGen/debug-info-enum.c +++ b/clang/test/CodeGen/debug-info-enum.c @@ -1,9 +1,9 @@ // RUN: %clang_cc1 -emit-llvm -g %s -o - | FileCheck %s -// CHECK: !MDCompositeType(tag: DW_TAG_enumeration_type, name: "e" +// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "e" // CHECK-SAME: elements: [[TEST3_ENUMS:![0-9]*]] // CHECK: [[TEST3_ENUMS]] = !{[[TEST3_E:![0-9]*]]} -// CHECK: [[TEST3_E]] = !MDEnumerator(name: "E", value: -1) +// CHECK: [[TEST3_E]] = !DIEnumerator(name: "E", value: -1) enum e; void func(enum e *p) { diff --git a/clang/test/CodeGen/debug-info-file-change.c b/clang/test/CodeGen/debug-info-file-change.c index f4c1251d173..abcffaf9bb4 100644 --- a/clang/test/CodeGen/debug-info-file-change.c +++ b/clang/test/CodeGen/debug-info-file-change.c @@ -14,9 +14,9 @@ int foo() { return i + j; } -// CHECK-NOT: !MDLexicalBlock -// CHECK: !MDLexicalBlockFile({{.*}}file: ![[MH:[0-9]+]] -// CHECK: !MDFile(filename: "m.h" -// CHECK: !MDLexicalBlockFile({{.*}}file: ![[MC:[0-9]+]] -// CHECK: !MDFile(filename: "m.c" -// CHECK-NOT: !MDLexicalBlock +// CHECK-NOT: !DILexicalBlock +// CHECK: !DILexicalBlockFile({{.*}}file: ![[MH:[0-9]+]] +// CHECK: !DIFile(filename: "m.h" +// CHECK: !DILexicalBlockFile({{.*}}file: ![[MC:[0-9]+]] +// CHECK: !DIFile(filename: "m.c" +// CHECK-NOT: !DILexicalBlock diff --git a/clang/test/CodeGen/debug-info-gline-tables-only2.c b/clang/test/CodeGen/debug-info-gline-tables-only2.c index e28856f3084..be457ab0b7a 100644 --- a/clang/test/CodeGen/debug-info-gline-tables-only2.c +++ b/clang/test/CodeGen/debug-info-gline-tables-only2.c @@ -8,6 +8,6 @@ int main() { } // CHECK: !llvm.dbg.cu = !{!0} -// CHECK: !MDCompileUnit( -// CHECK: !MDSubprogram( -// CHECK: !MDFile( +// CHECK: !DICompileUnit( +// CHECK: !DISubprogram( +// CHECK: !DIFile( diff --git a/clang/test/CodeGen/debug-info-limited.c b/clang/test/CodeGen/debug-info-limited.c index 72f9fb7486c..7c20ca4dd62 100644 --- a/clang/test/CodeGen/debug-info-limited.c +++ b/clang/test/CodeGen/debug-info-limited.c @@ -3,7 +3,7 @@ // Ensure we emit the full definition of 'foo' even though only its declaration // is needed, since C has no ODR to ensure that the definition will be the same // in whatever TU actually uses/requires the definition of 'foo'. -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "foo", +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "foo", // CHECK-NOT: DIFlagFwdDecl // CHECK-SAME: ){{$}} diff --git a/clang/test/CodeGen/debug-info-line.c b/clang/test/CodeGen/debug-info-line.c index 2e044d2ab37..bc0d23a2000 100644 --- a/clang/test/CodeGen/debug-info-line.c +++ b/clang/test/CodeGen/debug-info-line.c @@ -8,4 +8,4 @@ int f1(int a, int b) { b; } -// CHECK: [[DBG_F1]] = !MDLocation(line: 100, +// CHECK: [[DBG_F1]] = !DILocation(line: 100, diff --git a/clang/test/CodeGen/debug-info-line3.c b/clang/test/CodeGen/debug-info-line3.c index d2efcf72409..8ba57e208c0 100644 --- a/clang/test/CodeGen/debug-info-line3.c +++ b/clang/test/CodeGen/debug-info-line3.c @@ -13,4 +13,4 @@ void func(char c, char* d) } // CHECK: ret void, !dbg [[LINE:.*]] -// CHECK: [[LINE]] = !MDLocation(line: 6, +// CHECK: [[LINE]] = !DILocation(line: 6, diff --git a/clang/test/CodeGen/debug-info-line4.c b/clang/test/CodeGen/debug-info-line4.c index 2b3e0fe5bc6..3c99fc55211 100644 --- a/clang/test/CodeGen/debug-info-line4.c +++ b/clang/test/CodeGen/debug-info-line4.c @@ -8,4 +8,4 @@ int foo(int a, int b) { int c = a + b; } // Without column information we wouldn't change locations for b. -// CHECK: !MDLocation(line: 4, column: 20, +// CHECK: !DILocation(line: 4, column: 20, diff --git a/clang/test/CodeGen/debug-info-same-line.c b/clang/test/CodeGen/debug-info-same-line.c index e9fe3a7ab13..7b71f57a682 100644 --- a/clang/test/CodeGen/debug-info-same-line.c +++ b/clang/test/CodeGen/debug-info-same-line.c @@ -2,6 +2,6 @@ // Here two temporary nodes are identical (but should not get uniqued) while // building the full debug type. typedef struct { long x; } foo; typedef struct { foo *x; } bar; -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type,{{.*}} line: 4, size: 64, -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type,{{.*}} line: 4, size: 64, +// CHECK: !DICompositeType(tag: DW_TAG_structure_type,{{.*}} line: 4, size: 64, +// CHECK: !DICompositeType(tag: DW_TAG_structure_type,{{.*}} line: 4, size: 64, bar b; diff --git a/clang/test/CodeGen/debug-info-scope-file.c b/clang/test/CodeGen/debug-info-scope-file.c index 74456a0bfb3..97063198a95 100644 --- a/clang/test/CodeGen/debug-info-scope-file.c +++ b/clang/test/CodeGen/debug-info-scope-file.c @@ -5,10 +5,10 @@ // CHECK: ret void, !dbg [[F1_LINE:![0-9]*]] // CHECK: ret void, !dbg [[F2_LINE:![0-9]*]] -// CHECK: [[F1:![0-9]*]] = !MDSubprogram(name: "f1",{{.*}} isDefinition: true -// CHECK: [[F2:![0-9]*]] = !MDSubprogram(name: "f2",{{.*}} isDefinition: true -// CHECK: [[F1_LINE]] = !MDLocation({{.*}}, scope: [[F1]]) -// CHECK: [[F2_LINE]] = !MDLocation({{.*}}, scope: [[F2]]) +// CHECK: [[F1:![0-9]*]] = !DISubprogram(name: "f1",{{.*}} isDefinition: true +// CHECK: [[F2:![0-9]*]] = !DISubprogram(name: "f2",{{.*}} isDefinition: true +// CHECK: [[F1_LINE]] = !DILocation({{.*}}, scope: [[F1]]) +// CHECK: [[F2_LINE]] = !DILocation({{.*}}, scope: [[F2]]) void f1() { } diff --git a/clang/test/CodeGen/debug-info-scope.c b/clang/test/CodeGen/debug-info-scope.c index 5709e3e9de4..aa6e5c1f2da 100644 --- a/clang/test/CodeGen/debug-info-scope.c +++ b/clang/test/CodeGen/debug-info-scope.c @@ -5,23 +5,23 @@ int main() { int j = 0; int k = 0; -// CHECK: !MDLocalVariable(tag: DW_TAG_auto_variable, name: "i" -// CHECK-NEXT: !MDLexicalBlock( +// CHECK: !DILocalVariable(tag: DW_TAG_auto_variable, name: "i" +// CHECK-NEXT: !DILexicalBlock( // FIXME: Looks like we don't actually need both these lexical blocks (disc 2 // just refers to disc 1, nothing actually uses disc 2). -// GMLT-NOT: !MDLexicalBlock -// GMLT: !MDLexicalBlockFile({{.*}}, discriminator: 2) -// GMLT-NOT: !MDLexicalBlock -// GMLT: !MDLexicalBlockFile({{.*}}, discriminator: 1) +// GMLT-NOT: !DILexicalBlock +// GMLT: !DILexicalBlockFile({{.*}}, discriminator: 2) +// GMLT-NOT: !DILexicalBlock +// GMLT: !DILexicalBlockFile({{.*}}, discriminator: 1) // Make sure we don't have any more lexical blocks because we don't need them in // -gmlt. -// GMLT-NOT: !MDLexicalBlock +// GMLT-NOT: !DILexicalBlock for (int i = 0; i < 10; i++) j++; -// CHECK: !MDLocalVariable(tag: DW_TAG_auto_variable, name: "i" -// CHECK-NEXT: !MDLexicalBlock( -// GMLT-NOT: !MDLexicalBlock +// CHECK: !DILocalVariable(tag: DW_TAG_auto_variable, name: "i" +// CHECK-NEXT: !DILexicalBlock( +// GMLT-NOT: !DILexicalBlock for (int i = 0; i < 10; i++) k++; return 0; diff --git a/clang/test/CodeGen/debug-info-static.c b/clang/test/CodeGen/debug-info-static.c index cd4526ab124..115beaf84d4 100644 --- a/clang/test/CodeGen/debug-info-static.c +++ b/clang/test/CodeGen/debug-info-static.c @@ -1,6 +1,6 @@ // RUN: %clang_cc1 -g -emit-llvm -o - %s | FileCheck %s -// CHECK: !MDGlobalVariable({{.*}}variable: i32* @f.xyzzy +// CHECK: !DIGlobalVariable({{.*}}variable: i32* @f.xyzzy void f(void) { static int xyzzy; diff --git a/clang/test/CodeGen/debug-info-typedef.c b/clang/test/CodeGen/debug-info-typedef.c index a50b7f169cb..790e302984a 100644 --- a/clang/test/CodeGen/debug-info-typedef.c +++ b/clang/test/CodeGen/debug-info-typedef.c @@ -7,5 +7,5 @@ typedef int MyType; MyType a; -// CHECK: !MDDerivedType(tag: DW_TAG_typedef, name: "MyType", file: ![[HEADER:[0-9]+]], line: 2, -// CHECK: ![[HEADER]] = !MDFile(filename: "b.h", +// CHECK: !DIDerivedType(tag: DW_TAG_typedef, name: "MyType", file: ![[HEADER:[0-9]+]], line: 2, +// CHECK: ![[HEADER]] = !DIFile(filename: "b.h", diff --git a/clang/test/CodeGen/debug-info-vector.c b/clang/test/CodeGen/debug-info-vector.c index 047f1b2f73a..1075643cd60 100644 --- a/clang/test/CodeGen/debug-info-vector.c +++ b/clang/test/CodeGen/debug-info-vector.c @@ -4,8 +4,8 @@ typedef int v4si __attribute__((__vector_size__(16))); v4si a; // Test that we get an array type that's also a vector out of debug. -// CHECK: !MDCompositeType(tag: DW_TAG_array_type, +// CHECK: !DICompositeType(tag: DW_TAG_array_type, // CHECK-SAME: baseType: ![[INT:[0-9]+]] // CHECK-SAME: size: 128, align: 128 // CHECK-SAME: DIFlagVector -// CHECK: ![[INT]] = !MDBasicType(name: "int" +// CHECK: ![[INT]] = !DIBasicType(name: "int" diff --git a/clang/test/CodeGen/debug-info-vla.c b/clang/test/CodeGen/debug-info-vla.c index d58dc918c76..175c24cfb9d 100644 --- a/clang/test/CodeGen/debug-info-vla.c +++ b/clang/test/CodeGen/debug-info-vla.c @@ -4,8 +4,8 @@ void testVLAwithSize(int s) { // CHECK: dbg.declare // CHECK: dbg.declare({{.*}}, metadata ![[VAR:.*]], metadata ![[EXPR:.*]]) -// CHECK: ![[VAR]] = !MDLocalVariable(tag: DW_TAG_auto_variable, name: "vla",{{.*}} line: [[@LINE+2]] -// CHECK: ![[EXPR]] = !MDExpression(DW_OP_deref) +// CHECK: ![[VAR]] = !DILocalVariable(tag: DW_TAG_auto_variable, name: "vla",{{.*}} line: [[@LINE+2]] +// CHECK: ![[EXPR]] = !DIExpression(DW_OP_deref) int vla[s]; int i; for (i = 0; i < s; i++) { diff --git a/clang/test/CodeGen/debug-info.c b/clang/test/CodeGen/debug-info.c index e1ee08768a3..1a505ee8bfb 100644 --- a/clang/test/CodeGen/debug-info.c +++ b/clang/test/CodeGen/debug-info.c @@ -42,7 +42,7 @@ struct foo2 foo2; // Radar 7325611 -// CHECK: !MDDerivedType(tag: DW_TAG_typedef, name: "barfoo" +// CHECK: !DIDerivedType(tag: DW_TAG_typedef, name: "barfoo" typedef int barfoo; barfoo foo() { } diff --git a/clang/test/CodeGen/lifetime-debuginfo-1.c b/clang/test/CodeGen/lifetime-debuginfo-1.c index 5d83cbc4ab1..674346a031d 100644 --- a/clang/test/CodeGen/lifetime-debuginfo-1.c +++ b/clang/test/CodeGen/lifetime-debuginfo-1.c @@ -8,6 +8,6 @@ extern int x; int f() { int *p = &x; // CHECK: ret i32 %{{.*}}, !dbg [[DI:![0-9]*]] -// CHECK: [[DI]] = !MDLocation(line: [[@LINE+1]] +// CHECK: [[DI]] = !DILocation(line: [[@LINE+1]] return *p; } diff --git a/clang/test/CodeGen/lifetime-debuginfo-2.c b/clang/test/CodeGen/lifetime-debuginfo-2.c index db01c81db6d..03afbd8c18b 100644 --- a/clang/test/CodeGen/lifetime-debuginfo-2.c +++ b/clang/test/CodeGen/lifetime-debuginfo-2.c @@ -25,5 +25,5 @@ int test(int a, int b) { return res; // CHECK: ret i32 %{{.*}}, !dbg [[DI:![0-9]+]] -// CHECK: [[DI]] = !MDLocation(line: [[@LINE-2]] +// CHECK: [[DI]] = !DILocation(line: [[@LINE-2]] } diff --git a/clang/test/CodeGen/lineno-dbginfo.c b/clang/test/CodeGen/lineno-dbginfo.c index 1a0b7019f22..ac61c836494 100644 --- a/clang/test/CodeGen/lineno-dbginfo.c +++ b/clang/test/CodeGen/lineno-dbginfo.c @@ -1,7 +1,7 @@ // RUN: echo "#include <stddef.h>" > %t.h // RUN: %clang_cc1 -S -g -include %t.h %s -emit-llvm -o - | FileCheck %s -// CHECK: !MDGlobalVariable(name: "outer", +// CHECK: !DIGlobalVariable(name: "outer", // CHECK-NOT: linkageName: // CHECK-SAME: line: [[@LINE+2]] // CHECK-SAME: isDefinition: true diff --git a/clang/test/CodeGen/linetable-endscope.c b/clang/test/CodeGen/linetable-endscope.c index 9a737cf7965..961eaec7dec 100644 --- a/clang/test/CodeGen/linetable-endscope.c +++ b/clang/test/CodeGen/linetable-endscope.c @@ -11,7 +11,7 @@ void foo(char c) { int i; - // CHECK: ![[CONV]] = !MDLocation(line: [[@LINE+1]], scope: !{{.*}}) + // CHECK: ![[CONV]] = !DILocation(line: [[@LINE+1]], scope: !{{.*}}) i = c; - // CHECK: ![[RET]] = !MDLocation(line: [[@LINE+1]], scope: !{{.*}}) + // CHECK: ![[RET]] = !DILocation(line: [[@LINE+1]], scope: !{{.*}}) } diff --git a/clang/test/CodeGenCXX/2010-07-23-DeclLoc.cpp b/clang/test/CodeGenCXX/2010-07-23-DeclLoc.cpp index a1e1739ea77..3bd66da62af 100644 --- a/clang/test/CodeGenCXX/2010-07-23-DeclLoc.cpp +++ b/clang/test/CodeGenCXX/2010-07-23-DeclLoc.cpp @@ -1,10 +1,10 @@ // RUN: %clang_cc1 -emit-llvm -g %s -o - | FileCheck %s // Require the template function declaration refer to the correct filename. // First, locate the function decl in metadata, and pluck out the file handle: -// CHECK: !MDSubprogram(name: "extract_dwarf_data_from_header +// CHECK: !DISubprogram(name: "extract_dwarf_data_from_header // CHECK-SAME: file: [[FILE:![0-9]+]] // Second: Require that filehandle refer to the correct filename: -// CHECK: [[FILE]] = !MDFile(filename: "decl_should_be_here.hpp" +// CHECK: [[FILE]] = !DIFile(filename: "decl_should_be_here.hpp" typedef long unsigned int __darwin_size_t; typedef __darwin_size_t size_t; typedef unsigned char uint8_t; diff --git a/clang/test/CodeGenCXX/Inputs/debug-info-class-limited.cpp b/clang/test/CodeGenCXX/Inputs/debug-info-class-limited.cpp index be3d6dbe9e9..17fa456a45d 100644 --- a/clang/test/CodeGenCXX/Inputs/debug-info-class-limited.cpp +++ b/clang/test/CodeGenCXX/Inputs/debug-info-class-limited.cpp @@ -1,5 +1,5 @@ -// CHECK-DAG: !MDCompositeType(tag: DW_TAG_structure_type, name: "PR16214",{{.*}} line: [[@LINE+1]],{{.*}} isDefinition: true +// CHECK-DAG: !DICompositeType(tag: DW_TAG_structure_type, name: "PR16214",{{.*}} line: [[@LINE+1]],{{.*}} isDefinition: true struct PR16214 { int i; }; @@ -10,7 +10,7 @@ bar *a; bar b; namespace PR14467 { -// CHECK-DAG: !MDCompositeType(tag: DW_TAG_structure_type, name: "foo",{{.*}} line: [[@LINE+1]],{{.*}} isDefinition: true +// CHECK-DAG: !DICompositeType(tag: DW_TAG_structure_type, name: "foo",{{.*}} line: [[@LINE+1]],{{.*}} isDefinition: true struct foo { }; @@ -21,7 +21,7 @@ foo *bar(foo *a) { } namespace test1 { -// CHECK-DAG: !MDCompositeType(tag: DW_TAG_structure_type, name: "foo",{{.*}} line: [[@LINE+1]],{{.*}} isDefinition: true +// CHECK-DAG: !DICompositeType(tag: DW_TAG_structure_type, name: "foo",{{.*}} line: [[@LINE+1]],{{.*}} isDefinition: true struct foo { }; @@ -35,7 +35,7 @@ namespace test2 { // FIXME: if we were a bit fancier, we could realize that the 'foo' type is only // required because of the 'bar' type which is not required at all (or might // only be required to be declared) -// CHECK-DAG: !MDCompositeType(tag: DW_TAG_structure_type, name: "foo",{{.*}} line: [[@LINE+1]],{{.*}} isDefinition: true +// CHECK-DAG: !DICompositeType(tag: DW_TAG_structure_type, name: "foo",{{.*}} line: [[@LINE+1]],{{.*}} isDefinition: true struct foo { }; diff --git a/clang/test/CodeGenCXX/PR20038.cpp b/clang/test/CodeGenCXX/PR20038.cpp index a76a10017a1..0a10244db0e 100644 --- a/clang/test/CodeGenCXX/PR20038.cpp +++ b/clang/test/CodeGenCXX/PR20038.cpp @@ -6,9 +6,9 @@ struct C { extern bool b; // CHECK: call {{.*}}, !dbg [[DTOR_CALL1_LOC:![0-9]*]] // CHECK: call {{.*}}, !dbg [[DTOR_CALL2_LOC:![0-9]*]] -// CHECK: [[FUN1:.*]] = !MDSubprogram(name: "fun1",{{.*}} isDefinition: true -// CHECK: [[FUN2:.*]] = !MDSubprogram(name: "fun2",{{.*}} isDefinition: true -// CHECK: [[DTOR_CALL1_LOC]] = !MDLocation(line: [[@LINE+1]], scope: [[FUN1]]) +// CHECK: [[FUN1:.*]] = !DISubprogram(name: "fun1",{{.*}} isDefinition: true +// CHECK: [[FUN2:.*]] = !DISubprogram(name: "fun2",{{.*}} isDefinition: true +// CHECK: [[DTOR_CALL1_LOC]] = !DILocation(line: [[@LINE+1]], scope: [[FUN1]]) void fun1() { b && (C(), 1); } -// CHECK: [[DTOR_CALL2_LOC]] = !MDLocation(line: [[@LINE+1]], scope: [[FUN2]]) +// CHECK: [[DTOR_CALL2_LOC]] = !DILocation(line: [[@LINE+1]], scope: [[FUN2]]) bool fun2() { return (C(), b) && 0; } diff --git a/clang/test/CodeGenCXX/coverage.cpp b/clang/test/CodeGenCXX/coverage.cpp index 5460e2bfd0c..4b23324afaf 100644 --- a/clang/test/CodeGenCXX/coverage.cpp +++ b/clang/test/CodeGenCXX/coverage.cpp @@ -3,7 +3,7 @@ extern "C" void test_name1() {} void test_name2() {} -// CHECK: !MDSubprogram(name: "test_name1", +// CHECK: !DISubprogram(name: "test_name1", // CHECK-NOT: linkageName: // CHECK-SAME: ){{$}} -// CHECK: !MDSubprogram(name: "test_name2", linkageName: "_Z10test_name2v" +// CHECK: !DISubprogram(name: "test_name2", linkageName: "_Z10test_name2v" diff --git a/clang/test/CodeGenCXX/debug-info-access.cpp b/clang/test/CodeGenCXX/debug-info-access.cpp index d2ae8f41f63..86237b3bc32 100644 --- a/clang/test/CodeGenCXX/debug-info-access.cpp +++ b/clang/test/CodeGenCXX/debug-info-access.cpp @@ -1,37 +1,37 @@ // RUN: %clang_cc1 -emit-llvm -g -triple %itanium_abi_triple %s -o - | FileCheck %s // Test the various accessibility flags in the debug info. struct A { - // CHECK-DAG: !MDSubprogram(name: "pub_default",{{.*}} line: [[@LINE+1]],{{.*}} flags: DIFlagPrototyped, + // CHECK-DAG: !DISubprogram(name: "pub_default",{{.*}} line: [[@LINE+1]],{{.*}} flags: DIFlagPrototyped, void pub_default(); - // CHECK-DAG: !MDDerivedType(tag: DW_TAG_member, name: "pub_default_static",{{.*}} line: [[@LINE+1]],{{.*}} flags: DIFlagStaticMember) + // CHECK-DAG: !DIDerivedType(tag: DW_TAG_member, name: "pub_default_static",{{.*}} line: [[@LINE+1]],{{.*}} flags: DIFlagStaticMember) static int pub_default_static; }; -// CHECK: !MDDerivedType(tag: DW_TAG_inheritance,{{.*}} baseType: !"_ZTS1A",{{.*}} flags: DIFlagPublic) +// CHECK: !DIDerivedType(tag: DW_TAG_inheritance,{{.*}} baseType: !"_ZTS1A",{{.*}} flags: DIFlagPublic) class B : public A { public: - // CHECK-DAG: !MDSubprogram(name: "pub",{{.*}} line: [[@LINE+1]],{{.*}} flags: DIFlagPublic | DIFlagPrototyped, + // CHECK-DAG: !DISubprogram(name: "pub",{{.*}} line: [[@LINE+1]],{{.*}} flags: DIFlagPublic | DIFlagPrototyped, void pub(); - // CHECK-DAG: !MDDerivedType(tag: DW_TAG_member, name: "public_static",{{.*}} line: [[@LINE+1]],{{.*}} flags: DIFlagPublic | DIFlagStaticMember) + // CHECK-DAG: !DIDerivedType(tag: DW_TAG_member, name: "public_static",{{.*}} line: [[@LINE+1]],{{.*}} flags: DIFlagPublic | DIFlagStaticMember) static int public_static; protected: - // CHECK: !MDSubprogram(name: "prot",{{.*}} line: [[@LINE+1]],{{.*}} flags: DIFlagProtected | DIFlagPrototyped, + // CHECK: !DISubprogram(name: "prot",{{.*}} line: [[@LINE+1]],{{.*}} flags: DIFlagProtected | DIFlagPrototyped, void prot(); private: - // CHECK: !MDSubprogram(name: "priv_default",{{.*}} line: [[@LINE+1]],{{.*}} flags: DIFlagPrototyped, + // CHECK: !DISubprogram(name: "priv_default",{{.*}} line: [[@LINE+1]],{{.*}} flags: DIFlagPrototyped, void priv_default(); }; union U { - // CHECK-DAG: !MDSubprogram(name: "union_pub_default",{{.*}} line: [[@LINE+1]],{{.*}} flags: DIFlagPrototyped, + // CHECK-DAG: !DISubprogram(name: "union_pub_default",{{.*}} line: [[@LINE+1]],{{.*}} flags: DIFlagPrototyped, void union_pub_default(); private: - // CHECK-DAG: !MDDerivedType(tag: DW_TAG_member, name: "union_priv",{{.*}} line: [[@LINE+1]],{{.*}} flags: DIFlagPrivate) + // CHECK-DAG: !DIDerivedType(tag: DW_TAG_member, name: "union_priv",{{.*}} line: [[@LINE+1]],{{.*}} flags: DIFlagPrivate) int union_priv; }; -// CHECK: !MDSubprogram(name: "free", +// CHECK: !DISubprogram(name: "free", // CHECK-SAME: isDefinition: true // CHECK-SAME: flags: DIFlagPrototyped, void free() {} diff --git a/clang/test/CodeGenCXX/debug-info-alias.cpp b/clang/test/CodeGenCXX/debug-info-alias.cpp index ffe5c752178..90476439e78 100644 --- a/clang/test/CodeGenCXX/debug-info-alias.cpp +++ b/clang/test/CodeGenCXX/debug-info-alias.cpp @@ -13,27 +13,27 @@ bar = foo<T*>; } -// CHECK: !MDGlobalVariable(name: "bi",{{.*}} type: [[BINT:![0-9]+]] -// CHECK: [[BINT]] = !MDDerivedType(tag: DW_TAG_typedef, name: "bar<int>" +// CHECK: !DIGlobalVariable(name: "bi",{{.*}} type: [[BINT:![0-9]+]] +// CHECK: [[BINT]] = !DIDerivedType(tag: DW_TAG_typedef, name: "bar<int>" // CHECK-SAME: line: 42, x::bar<int> bi; -// CHECK: !MDGlobalVariable(name: "bf",{{.*}} type: [[BFLOAT:![0-9]+]] -// CHECK: [[BFLOAT]] = !MDDerivedType(tag: DW_TAG_typedef, name: "bar<float>" +// CHECK: !DIGlobalVariable(name: "bf",{{.*}} type: [[BFLOAT:![0-9]+]] +// CHECK: [[BFLOAT]] = !DIDerivedType(tag: DW_TAG_typedef, name: "bar<float>" x::bar<float> bf; using -// CHECK: !MDGlobalVariable(name: "n",{{.*}} type: [[NARF:![0-9]+]] +// CHECK: !DIGlobalVariable(name: "n",{{.*}} type: [[NARF:![0-9]+]] # 142 -narf // CHECK: [[NARF]] = !MDDerivedType(tag: DW_TAG_typedef, name: "narf" +narf // CHECK: [[NARF]] = !DIDerivedType(tag: DW_TAG_typedef, name: "narf" // CHECK-SAME: line: 142 = int; narf n; template <typename T> using tv = void; -// CHECK: !MDDerivedType(tag: DW_TAG_typedef, name: "tv<int>" +// CHECK: !DIDerivedType(tag: DW_TAG_typedef, name: "tv<int>" tv<int> *tvp; using v = void; -// CHECK: !MDDerivedType(tag: DW_TAG_typedef, name: "v" +// CHECK: !DIDerivedType(tag: DW_TAG_typedef, name: "v" v *vp; diff --git a/clang/test/CodeGenCXX/debug-info-anon-union-vars.cpp b/clang/test/CodeGenCXX/debug-info-anon-union-vars.cpp index d75ce69d4c6..cfc7bc8fbfe 100644 --- a/clang/test/CodeGenCXX/debug-info-anon-union-vars.cpp +++ b/clang/test/CodeGenCXX/debug-info-anon-union-vars.cpp @@ -21,8 +21,8 @@ int test_it() { return (c == 1); } -// CHECK: [[FILE:.*]] = !MDFile(filename: "{{.*}}debug-info-anon-union-vars.cpp", -// CHECK: !MDGlobalVariable(name: "c",{{.*}} file: [[FILE]], line: 6,{{.*}} isLocal: true, isDefinition: true -// CHECK: !MDGlobalVariable(name: "d",{{.*}} file: [[FILE]], line: 6,{{.*}} isLocal: true, isDefinition: true -// CHECK: !MDGlobalVariable(name: "a",{{.*}} file: [[FILE]], line: 6,{{.*}} isLocal: true, isDefinition: true -// CHECK: !MDGlobalVariable(name: "b",{{.*}} file: [[FILE]], line: 6,{{.*}} isLocal: true, isDefinition: true +// CHECK: [[FILE:.*]] = !DIFile(filename: "{{.*}}debug-info-anon-union-vars.cpp", +// CHECK: !DIGlobalVariable(name: "c",{{.*}} file: [[FILE]], line: 6,{{.*}} isLocal: true, isDefinition: true +// CHECK: !DIGlobalVariable(name: "d",{{.*}} file: [[FILE]], line: 6,{{.*}} isLocal: true, isDefinition: true +// CHECK: !DIGlobalVariable(name: "a",{{.*}} file: [[FILE]], line: 6,{{.*}} isLocal: true, isDefinition: true +// CHECK: !DIGlobalVariable(name: "b",{{.*}} file: [[FILE]], line: 6,{{.*}} isLocal: true, isDefinition: true diff --git a/clang/test/CodeGenCXX/debug-info-artificial-arg.cpp b/clang/test/CodeGenCXX/debug-info-artificial-arg.cpp index 2f03688b60f..dc3ac8a4540 100644 --- a/clang/test/CodeGenCXX/debug-info-artificial-arg.cpp +++ b/clang/test/CodeGenCXX/debug-info-artificial-arg.cpp @@ -22,12 +22,12 @@ int main(int argc, char **argv) { A reallyA (500); } -// CHECK: ![[CLASSTYPE:.*]] = !MDCompositeType(tag: DW_TAG_class_type, name: "A", +// CHECK: ![[CLASSTYPE:.*]] = !DICompositeType(tag: DW_TAG_class_type, name: "A", // CHECK-SAME: identifier: "_ZTS1A" -// CHECK: ![[ARTARG:.*]] = !MDDerivedType(tag: DW_TAG_pointer_type, baseType: !"_ZTS1A", +// CHECK: ![[ARTARG:.*]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !"_ZTS1A", // CHECK-SAME: DIFlagArtificial -// CHECK: !MDSubprogram(name: "A", scope: !"_ZTS1A" +// CHECK: !DISubprogram(name: "A", scope: !"_ZTS1A" // CHECK-SAME: line: 12 // CHECK-SAME: DIFlagPublic -// CHECK: !MDSubroutineType(types: [[FUNCTYPE:![0-9]*]]) +// CHECK: !DISubroutineType(types: [[FUNCTYPE:![0-9]*]]) // CHECK: [[FUNCTYPE]] = !{null, ![[ARTARG]], !{{.*}}, !{{.*}}} diff --git a/clang/test/CodeGenCXX/debug-info-blocks.cpp b/clang/test/CodeGenCXX/debug-info-blocks.cpp index 608a273cb0b..7762726dc77 100644 --- a/clang/test/CodeGenCXX/debug-info-blocks.cpp +++ b/clang/test/CodeGenCXX/debug-info-blocks.cpp @@ -10,9 +10,9 @@ void test() { __block A a; } -// CHECK: !MDSubprogram(name: "__Block_byref_object_copy_", +// CHECK: !DISubprogram(name: "__Block_byref_object_copy_", // CHECK-SAME: line: 10, // CHECK-SAME: isLocal: true, isDefinition: true -// CHECK: !MDSubprogram(name: "__Block_byref_object_dispose_", +// CHECK: !DISubprogram(name: "__Block_byref_object_dispose_", // CHECK-SAME: line: 10, // CHECK-SAME: isLocal: true, isDefinition: true diff --git a/clang/test/CodeGenCXX/debug-info-char16.cpp b/clang/test/CodeGenCXX/debug-info-char16.cpp index c2606d4c6d0..912da6f86e5 100644 --- a/clang/test/CodeGenCXX/debug-info-char16.cpp +++ b/clang/test/CodeGenCXX/debug-info-char16.cpp @@ -3,5 +3,5 @@ // 16 is DW_ATE_UTF (0x10) encoding attribute. char16_t char_a = u'h'; -// CHECK: !{{.*}} = !MDBasicType(name: "char16_t" +// CHECK: !{{.*}} = !DIBasicType(name: "char16_t" // CHECK-SAME: encoding: DW_ATE_UTF) diff --git a/clang/test/CodeGenCXX/debug-info-class-nolimit.cpp b/clang/test/CodeGenCXX/debug-info-class-nolimit.cpp index 042794c9a06..11d1792e6f3 100644 --- a/clang/test/CodeGenCXX/debug-info-class-nolimit.cpp +++ b/clang/test/CodeGenCXX/debug-info-class-nolimit.cpp @@ -6,7 +6,7 @@ namespace rdar14101097_1 { // see also PR16214 // Check that we emit debug info for the definition of a struct if the // definition is available, even if it's used via a pointer wrapped in a // typedef. -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "foo" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "foo" // CHECK-NOT: DIFlagFwdDecl // CHECK-SAME: ){{$}} struct foo { @@ -23,7 +23,7 @@ namespace rdar14101097_2 { // As above, except trickier because we first encounter only a declaration of // the type and no debug-info related use after we see the definition of the // type. -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "foo" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "foo" // CHECK-NOT: DIFlagFwdDecl // CHECK-SAME: ){{$}} struct foo; diff --git a/clang/test/CodeGenCXX/debug-info-class.cpp b/clang/test/CodeGenCXX/debug-info-class.cpp index b4f88eade84..a63efe5d780 100644 --- a/clang/test/CodeGenCXX/debug-info-class.cpp +++ b/clang/test/CodeGenCXX/debug-info-class.cpp @@ -90,63 +90,63 @@ int main(int argc, char **argv) { // CHECK: invoke {{.+}} @_ZN1BD1Ev(%class.B* %b) // CHECK-NEXT: unwind label %{{.+}}, !dbg ![[EXCEPTLOC:.*]] // CHECK: store i32 0, i32* %{{.+}}, !dbg ![[RETLOC:.*]] -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "foo" -// CHECK: !MDCompositeType(tag: DW_TAG_class_type, name: "bar" -// CHECK: !MDCompositeType(tag: DW_TAG_union_type, name: "baz" -// CHECK: !MDCompositeType(tag: DW_TAG_class_type, name: "B" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "foo" +// CHECK: !DICompositeType(tag: DW_TAG_class_type, name: "bar" +// CHECK: !DICompositeType(tag: DW_TAG_union_type, name: "baz" +// CHECK: !DICompositeType(tag: DW_TAG_class_type, name: "B" // CHECK-NOT: DIFlagFwdDecl // CHECK-SAME: ){{$}} -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "_vptr$B", +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "_vptr$B", // CHECK-SAME: DIFlagArtificial -// CHECK: ![[INT:[0-9]+]] = !MDBasicType(name: "int" +// CHECK: ![[INT:[0-9]+]] = !DIBasicType(name: "int" -// CHECK: [[C:![0-9]*]] = !MDCompositeType(tag: DW_TAG_structure_type, name: "C", +// CHECK: [[C:![0-9]*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "C", // CHECK-NOT: DIFlagFwdDecl // CHECK-SAME: elements: [[C_MEM:![0-9]*]] // CHECK-SAME: vtableHolder: !"_ZTS1C" // CHECK-SAME: identifier: "_ZTS1C" // CHECK: [[C_MEM]] = !{[[C_VPTR:![0-9]*]], [[C_S:![0-9]*]], [[C_DTOR:![0-9]*]]} -// CHECK: [[C_VPTR]] = !MDDerivedType(tag: DW_TAG_member, name: "_vptr$C" +// CHECK: [[C_VPTR]] = !DIDerivedType(tag: DW_TAG_member, name: "_vptr$C" // CHECK-SAME: DIFlagArtificial -// CHECK: [[C_S]] = !MDDerivedType(tag: DW_TAG_member, name: "s" +// CHECK: [[C_S]] = !DIDerivedType(tag: DW_TAG_member, name: "s" // CHECK-SAME: baseType: ![[INT]] // CHECK-SAME: DIFlagStaticMember -// CHECK: [[C_DTOR]] = !MDSubprogram(name: "~C" +// CHECK: [[C_DTOR]] = !DISubprogram(name: "~C" -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "D" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "D" // CHECK-SAME: DIFlagFwdDecl // CHECK-SAME: identifier: "_ZTS1D" -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "E" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "E" // CHECK-SAME: DIFlagFwdDecl // CHECK-SAME: identifier: "_ZTS1E" -// CHECK: [[F:![0-9]*]] = !MDCompositeType(tag: DW_TAG_structure_type, name: "F" +// CHECK: [[F:![0-9]*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "F" // CHECK-SAME: DIFlagFwdDecl // CHECK-SAME: identifier: "_ZTS1F" -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "G" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "G" // CHECK-SAME: DIFlagFwdDecl // CHECK-SAME: identifier: "_ZTS1G" -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "inner" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "inner" // CHECK: line: 50 // CHECK-NOT: DIFlagFwdDecl // CHECK-SAME: elements: [[G_INNER_MEM:![0-9]*]] // CHECK-SAME: identifier: "_ZTSN1G5innerE" // CHECK: [[G_INNER_MEM]] = !{[[G_INNER_I:![0-9]*]]} -// CHECK: [[G_INNER_I]] = !MDDerivedType(tag: DW_TAG_member, name: "j" +// CHECK: [[G_INNER_I]] = !DIDerivedType(tag: DW_TAG_member, name: "j" // CHECK-SAME: baseType: ![[INT]] -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "A" -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "HdrSize" -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "I" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "A" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "HdrSize" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "I" // CHECK-NOT: DIFlagFwdDecl // CHECK-SAME: ){{$}} // -// CHECK: !MDSubprogram(name: "func",{{.*}} scope: !"_ZTS1D" +// CHECK: !DISubprogram(name: "func",{{.*}} scope: !"_ZTS1D" // CHECK-SAME: isDefinition: true // CHECK-SAME: declaration: [[D_FUNC_DECL:![0-9]*]] -// CHECK: [[D_FUNC_DECL]] = !MDSubprogram(name: "func",{{.*}} scope: !"_ZTS1D" +// CHECK: [[D_FUNC_DECL]] = !DISubprogram(name: "func",{{.*}} scope: !"_ZTS1D" // CHECK-SAME: isDefinition: false -// CHECK: ![[EXCEPTLOC]] = !MDLocation(line: 84, -// CHECK: ![[RETLOC]] = !MDLocation(line: 83, +// CHECK: ![[EXCEPTLOC]] = !DILocation(line: 84, +// CHECK: ![[RETLOC]] = !DILocation(line: 83, diff --git a/clang/test/CodeGenCXX/debug-info-cxx1y.cpp b/clang/test/CodeGenCXX/debug-info-cxx1y.cpp index cd75fcd076b..026be3d5223 100644 --- a/clang/test/CodeGenCXX/debug-info-cxx1y.cpp +++ b/clang/test/CodeGenCXX/debug-info-cxx1y.cpp @@ -1,17 +1,17 @@ // RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm-only -std=c++14 -emit-llvm -g %s -o - | FileCheck %s // CHECK: [[EMPTY:![0-9]*]] = !{} -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "foo", +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "foo", // CHECK-SAME: elements: [[EMPTY]] // FIXME: The context of this definition should be the CU/file scope, not the class. -// CHECK: !MDSubprogram(name: "func", {{.*}} scope: !"_ZTS3foo" +// CHECK: !DISubprogram(name: "func", {{.*}} scope: !"_ZTS3foo" // CHECK-SAME: type: [[SUBROUTINE_TYPE:![0-9]*]] // CHECK-SAME: isDefinition: true // CHECK-SAME: declaration: [[FUNC_DECL:![0-9]*]] -// CHECK: [[SUBROUTINE_TYPE]] = !MDSubroutineType(types: [[TYPE_LIST:![0-9]*]]) +// CHECK: [[SUBROUTINE_TYPE]] = !DISubroutineType(types: [[TYPE_LIST:![0-9]*]]) // CHECK: [[TYPE_LIST]] = !{[[INT:![0-9]*]]} -// CHECK: [[INT]] = !MDBasicType(name: "int" -// CHECK: [[FUNC_DECL]] = !MDSubprogram(name: "func", +// CHECK: [[INT]] = !DIBasicType(name: "int" +// CHECK: [[FUNC_DECL]] = !DISubprogram(name: "func", // CHECK-SAME: scope: !"_ZTS3foo" // CHECK-SAME: type: [[SUBROUTINE_TYPE]] // CHECK-SAME: isDefinition: false diff --git a/clang/test/CodeGenCXX/debug-info-decl-nested.cpp b/clang/test/CodeGenCXX/debug-info-decl-nested.cpp index 6ceb31bf9af..2c352417539 100644 --- a/clang/test/CodeGenCXX/debug-info-decl-nested.cpp +++ b/clang/test/CodeGenCXX/debug-info-decl-nested.cpp @@ -17,13 +17,13 @@ class OuterClass public: InnerClass(); // Here createContextChain() generates a limited type for OuterClass. } theInnerClass; -// CHECK0: ![[DECL:[0-9]+]] = !MDSubprogram(name: "OuterClass" +// CHECK0: ![[DECL:[0-9]+]] = !DISubprogram(name: "OuterClass" // CHECK0-SAME: line: [[@LINE+2]] // CHECK0-SAME: isDefinition: false OuterClass(const Foo *); // line 10 }; OuterClass::InnerClass OuterClass::theInnerClass; // This toplevel decl causes InnerClass to be generated. -// CHECK0: !MDSubprogram(name: "OuterClass" +// CHECK0: !DISubprogram(name: "OuterClass" // CHECK0-SAME: line: [[@LINE+3]] // CHECK0-SAME: isDefinition: true // CHECK0-SAME: declaration: ![[DECL]] @@ -41,13 +41,13 @@ class OuterClass1 public: InnerClass1(); } theInnerClass1; -// CHECK1: ![[DECL:[0-9]+]] = !MDSubprogram(name: "Bar" +// CHECK1: ![[DECL:[0-9]+]] = !DISubprogram(name: "Bar" // CHECK1-SAME: line: [[@LINE+2]] // CHECK1-SAME: isDefinition: false void Bar(const Foo1 *); }; OuterClass1::InnerClass1 OuterClass1::theInnerClass1; -// CHECK1: !MDSubprogram(name: "Bar" +// CHECK1: !DISubprogram(name: "Bar" // CHECK1-SAME: line: [[@LINE+3]] // CHECK1-SAME: isDefinition: true // CHECK1-SAME: declaration: ![[DECL]] @@ -64,13 +64,13 @@ class OuterClass2 public: InnerClass2(); } theInnerClass2; -// CHECK2: ![[DECL:[0-9]+]] = !MDSubprogram(name: "~OuterClass2" +// CHECK2: ![[DECL:[0-9]+]] = !DISubprogram(name: "~OuterClass2" // CHECK2-SAME: line: [[@LINE+2]] // CHECK2-SAME: isDefinition: false ~OuterClass2(); // line 10 }; OuterClass2::InnerClass2 OuterClass2::theInnerClass2; -// CHECK4: !MDSubprogram(name: "~OuterClass2" +// CHECK4: !DISubprogram(name: "~OuterClass2" // CHECK4-SAME: line: [[@LINE+3]] // CHECK4-SAME: isDefinition: true // CHECK4-SAME: declaration: ![[DECL]] diff --git a/clang/test/CodeGenCXX/debug-info-dup-fwd-decl.cpp b/clang/test/CodeGenCXX/debug-info-dup-fwd-decl.cpp index c3458aeb657..db9d2e9f491 100644 --- a/clang/test/CodeGenCXX/debug-info-dup-fwd-decl.cpp +++ b/clang/test/CodeGenCXX/debug-info-dup-fwd-decl.cpp @@ -19,6 +19,6 @@ protected: Test t; -// CHECK: !MDDerivedType(tag: DW_TAG_pointer_type -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "data" -// CHECK-NOT: !MDCompositeType(tag: DW_TAG_structure_type, name: "data" +// CHECK: !DIDerivedType(tag: DW_TAG_pointer_type +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "data" +// CHECK-NOT: !DICompositeType(tag: DW_TAG_structure_type, name: "data" diff --git a/clang/test/CodeGenCXX/debug-info-enum-class.cpp b/clang/test/CodeGenCXX/debug-info-enum-class.cpp index 61b502e40d7..ded18bffe37 100644 --- a/clang/test/CodeGenCXX/debug-info-enum-class.cpp +++ b/clang/test/CodeGenCXX/debug-info-enum-class.cpp @@ -9,23 +9,23 @@ B b; C c; D d; -// CHECK: !MDCompositeType(tag: DW_TAG_enumeration_type, name: "A" +// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "A" // CHECK-SAME: line: 3 // CHECK-SAME: baseType: ![[INT:[0-9]+]] // CHECK-SAME: size: 32, align: 32 // CHECK-NOT: offset: // CHECK-NOT: flags: // CHECK-SAME: ){{$}} -// CHECK: ![[INT]] = !MDBasicType(name: "int" -// CHECK: !MDCompositeType(tag: DW_TAG_enumeration_type, name: "B" +// CHECK: ![[INT]] = !DIBasicType(name: "int" +// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "B" // CHECK-SAME: line: 4 // CHECK-SAME: baseType: ![[ULONG:[0-9]+]] // CHECK-SAME: size: 64, align: 64 // CHECK-NOT: offset: // CHECK-NOT: flags: // CHECK-SAME: ){{$}} -// CHECK: ![[ULONG]] = !MDBasicType(name: "long unsigned int" -// CHECK: !MDCompositeType(tag: DW_TAG_enumeration_type, name: "C" +// CHECK: ![[ULONG]] = !DIBasicType(name: "long unsigned int" +// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "C" // CHECK-SAME: line: 5 // CHECK-NOT: baseType: // CHECK-SAME: size: 32, align: 32 @@ -49,13 +49,13 @@ namespace PR14029 { namespace test2 { // FIXME: this should just be a declaration under -fno-standalone-debug -// CHECK: !MDCompositeType(tag: DW_TAG_enumeration_type, name: "E" +// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "E" // CHECK-SAME: scope: [[TEST2:![0-9]+]] // CHECK-SAME: elements: [[TEST_ENUMS:![0-9]+]] // CHECK-SAME: identifier: "_ZTSN5test21EE" -// CHECK: [[TEST2]] = !MDNamespace(name: "test2" +// CHECK: [[TEST2]] = !DINamespace(name: "test2" // CHECK: [[TEST_ENUMS]] = !{[[TEST_E:![0-9]*]]} -// CHECK: [[TEST_E]] = !MDEnumerator(name: "e", value: 0) +// CHECK: [[TEST_E]] = !DIEnumerator(name: "e", value: 0) enum E : int; void func(E *) { } @@ -64,22 +64,22 @@ enum E : int { e }; namespace test3 { // FIXME: this should just be a declaration under -fno-standalone-debug -// CHECK: !MDCompositeType(tag: DW_TAG_enumeration_type, name: "E" +// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "E" // CHECK-SAME: scope: [[TEST3:![0-9]+]] // CHECK-SAME: elements: [[TEST_ENUMS]] // CHECK-SAME: identifier: "_ZTSN5test31EE" -// CHECK: [[TEST3]] = !MDNamespace(name: "test3" +// CHECK: [[TEST3]] = !DINamespace(name: "test3" enum E : int { e }; void func(E *) { } } namespace test4 { -// CHECK: !MDCompositeType(tag: DW_TAG_enumeration_type, name: "E" +// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "E" // CHECK-SAME: scope: [[TEST4:![0-9]+]] // CHECK-SAME: elements: [[TEST_ENUMS]] // CHECK-SAME: identifier: "_ZTSN5test41EE" -// CHECK: [[TEST4]] = !MDNamespace(name: "test4" +// CHECK: [[TEST4]] = !DINamespace(name: "test4" enum E : int; void f1(E *) { } @@ -88,18 +88,18 @@ void f2(E) { } } -// CHECK: !MDCompositeType(tag: DW_TAG_enumeration_type, name: "D" +// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "D" // CHECK-SAME: line: 6 // CHECK-SAME: size: 16, align: 16 // CHECK-NOT: offset: // CHECK-SAME: flags: DIFlagFwdDecl namespace test5 { -// CHECK: !MDCompositeType(tag: DW_TAG_enumeration_type, name: "E" +// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "E" // CHECK-SAME: scope: [[TEST5:![0-9]+]] // CHECK-SAME: flags: DIFlagFwdDecl // CHECK-SAME: identifier: "_ZTSN5test51EE" -// CHECK: [[TEST5]] = !MDNamespace(name: "test5" +// CHECK: [[TEST5]] = !DINamespace(name: "test5" enum E : int; void f1(E *) { } diff --git a/clang/test/CodeGenCXX/debug-info-enum.cpp b/clang/test/CodeGenCXX/debug-info-enum.cpp index 4ba832870d1..613ffef7ddb 100644 --- a/clang/test/CodeGenCXX/debug-info-enum.cpp +++ b/clang/test/CodeGenCXX/debug-info-enum.cpp @@ -1,17 +1,17 @@ // RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -g %s -o - | FileCheck %s -// CHECK: !MDCompileUnit( +// CHECK: !DICompileUnit( // CHECK-SAME: enums: [[ENUMS:![0-9]*]] // CHECK: [[ENUMS]] = !{[[E1:![0-9]*]], [[E2:![0-9]*]], [[E3:![0-9]*]]} namespace test1 { -// CHECK: [[E1]] = !MDCompositeType(tag: DW_TAG_enumeration_type, name: "e" +// CHECK: [[E1]] = !DICompositeType(tag: DW_TAG_enumeration_type, name: "e" // CHECK-SAME: scope: [[TEST1:![0-9]*]] // CHECK-SAME: elements: [[TEST1_ENUMS:![0-9]*]] // CHECK-SAME: identifier: "_ZTSN5test11eE" -// CHECK: [[TEST1]] = !MDNamespace(name: "test1" +// CHECK: [[TEST1]] = !DINamespace(name: "test1" // CHECK: [[TEST1_ENUMS]] = !{[[TEST1_E:![0-9]*]]} -// CHECK: [[TEST1_E]] = !MDEnumerator(name: "E", value: 0) +// CHECK: [[TEST1_E]] = !DIEnumerator(name: "E", value: 0) enum e { E }; void foo() { int v = E; @@ -20,11 +20,11 @@ void foo() { namespace test2 { // rdar://8195980 -// CHECK: [[E2]] = !MDCompositeType(tag: DW_TAG_enumeration_type, name: "e" +// CHECK: [[E2]] = !DICompositeType(tag: DW_TAG_enumeration_type, name: "e" // CHECK-SAME: scope: [[TEST2:![0-9]+]] // CHECK-SAME: elements: [[TEST1_ENUMS]] // CHECK-SAME: identifier: "_ZTSN5test21eE" -// CHECK: [[TEST2]] = !MDNamespace(name: "test2" +// CHECK: [[TEST2]] = !DINamespace(name: "test2" enum e { E }; bool func(int i) { return i == E; @@ -32,13 +32,13 @@ bool func(int i) { } namespace test3 { -// CHECK: [[E3]] = !MDCompositeType(tag: DW_TAG_enumeration_type, name: "e" +// CHECK: [[E3]] = !DICompositeType(tag: DW_TAG_enumeration_type, name: "e" // CHECK-SAME: scope: [[TEST3:![0-9]*]] // CHECK-SAME: elements: [[TEST3_ENUMS:![0-9]*]] // CHECK-SAME: identifier: "_ZTSN5test31eE" -// CHECK: [[TEST3]] = !MDNamespace(name: "test3" +// CHECK: [[TEST3]] = !DINamespace(name: "test3" // CHECK: [[TEST3_ENUMS]] = !{[[TEST3_E:![0-9]*]]} -// CHECK: [[TEST3_E]] = !MDEnumerator(name: "E", value: -1) +// CHECK: [[TEST3_E]] = !DIEnumerator(name: "E", value: -1) enum e { E = -1 }; void func() { e x; diff --git a/clang/test/CodeGenCXX/debug-info-flex-member.cpp b/clang/test/CodeGenCXX/debug-info-flex-member.cpp index 25dcaab6f83..afc9d250c92 100644 --- a/clang/test/CodeGenCXX/debug-info-flex-member.cpp +++ b/clang/test/CodeGenCXX/debug-info-flex-member.cpp @@ -1,6 +1,6 @@ // RUN: %clang_cc1 -emit-llvm -g -triple x86_64-apple-darwin %s -o - | FileCheck %s -// CHECK: !MDSubrange(count: -1) +// CHECK: !DISubrange(count: -1) struct StructName { int member[]; diff --git a/clang/test/CodeGenCXX/debug-info-fn-template.cpp b/clang/test/CodeGenCXX/debug-info-fn-template.cpp index f954eebe492..2aed4bef71c 100644 --- a/clang/test/CodeGenCXX/debug-info-fn-template.cpp +++ b/clang/test/CodeGenCXX/debug-info-fn-template.cpp @@ -10,6 +10,6 @@ T fx(XF<T> xi) { return xi.member; } -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "XF<int>" -// CHECK: !MDTemplateTypeParameter(name: "T" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "XF<int>" +// CHECK: !DITemplateTypeParameter(name: "T" template int fx(XF<int>); diff --git a/clang/test/CodeGenCXX/debug-info-function-context.cpp b/clang/test/CodeGenCXX/debug-info-function-context.cpp index f332f7cfff2..9ae96112b57 100644 --- a/clang/test/CodeGenCXX/debug-info-function-context.cpp +++ b/clang/test/CodeGenCXX/debug-info-function-context.cpp @@ -25,12 +25,12 @@ int global_namespace_variable = 1; // functions that belong to the namespace have it as a context, and the global // function has the file as a context. -// CHECK: ![[FILE:[0-9]+]] = !MDFile(filename: "{{.*}}context.cpp", -// CHECK: !MDSubprogram(name: "member_function",{{.*}} scope: !"_ZTS1C",{{.*}} isDefinition: true +// CHECK: ![[FILE:[0-9]+]] = !DIFile(filename: "{{.*}}context.cpp", +// CHECK: !DISubprogram(name: "member_function",{{.*}} scope: !"_ZTS1C",{{.*}} isDefinition: true -// CHECK: !MDSubprogram(name: "static_member_function",{{.*}} scope: !"_ZTS1C",{{.*}} isDefinition: true +// CHECK: !DISubprogram(name: "static_member_function",{{.*}} scope: !"_ZTS1C",{{.*}} isDefinition: true -// CHECK: !MDSubprogram(name: "global_function",{{.*}} scope: ![[FILE]],{{.*}} isDefinition: true +// CHECK: !DISubprogram(name: "global_function",{{.*}} scope: ![[FILE]],{{.*}} isDefinition: true -// CHECK: !MDSubprogram(name: "global_namespace_function",{{.*}} scope: ![[NS:[0-9]+]],{{.*}} isDefinition: true -// CHECK: ![[NS]] = !MDNamespace(name: "ns" +// CHECK: !DISubprogram(name: "global_namespace_function",{{.*}} scope: ![[NS:[0-9]+]],{{.*}} isDefinition: true +// CHECK: ![[NS]] = !DINamespace(name: "ns" diff --git a/clang/test/CodeGenCXX/debug-info-fwd-ref.cpp b/clang/test/CodeGenCXX/debug-info-fwd-ref.cpp index 351dc0524e9..247d36411cd 100644 --- a/clang/test/CodeGenCXX/debug-info-fwd-ref.cpp +++ b/clang/test/CodeGenCXX/debug-info-fwd-ref.cpp @@ -19,7 +19,7 @@ int main(int argc, char** argv) { // Make sure we have two DW_TAG_structure_types for baz and bar and no forward // references. // CHECK-NOT: DIFlagFwdDecl -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "bar" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "bar" // CHECK-NOT: DIFlagFwdDecl -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "baz" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "baz" // CHECK-NOT: DIFlagFwdDecl diff --git a/clang/test/CodeGenCXX/debug-info-global-ctor-dtor.cpp b/clang/test/CodeGenCXX/debug-info-global-ctor-dtor.cpp index b91a04721d6..05780b58f9d 100644 --- a/clang/test/CodeGenCXX/debug-info-global-ctor-dtor.cpp +++ b/clang/test/CodeGenCXX/debug-info-global-ctor-dtor.cpp @@ -16,12 +16,12 @@ void foo() { static A stat; } -// CHECK-NOKEXT: !MDSubprogram(name: "__cxx_global_var_init",{{.*}} line: 12,{{.*}} isLocal: true, isDefinition: true -// CHECK-NOKEXT: !MDSubprogram(name: "__dtor_glob",{{.*}} line: 12,{{.*}} isLocal: true, isDefinition: true -// CHECK-NOKEXT: !MDSubprogram(name: "__cxx_global_var_init1",{{.*}} line: 13,{{.*}} isLocal: true, isDefinition: true -// CHECK-NOKEXT: !MDSubprogram(name: "__cxx_global_array_dtor",{{.*}} line: 13,{{.*}} isLocal: true, isDefinition: true -// CHECK-NOKEXT: !MDSubprogram(name: "__dtor_array",{{.*}} line: 13,{{.*}} isLocal: true, isDefinition: true -// CHECK-NOKEXT: !MDSubprogram(name: "__dtor__ZZ3foovE4stat",{{.*}} line: 16,{{.*}} isLocal: true, isDefinition: true -// CHECK-NOKEXT: !MDSubprogram({{.*}} isLocal: true, isDefinition: true +// CHECK-NOKEXT: !DISubprogram(name: "__cxx_global_var_init",{{.*}} line: 12,{{.*}} isLocal: true, isDefinition: true +// CHECK-NOKEXT: !DISubprogram(name: "__dtor_glob",{{.*}} line: 12,{{.*}} isLocal: true, isDefinition: true +// CHECK-NOKEXT: !DISubprogram(name: "__cxx_global_var_init1",{{.*}} line: 13,{{.*}} isLocal: true, isDefinition: true +// CHECK-NOKEXT: !DISubprogram(name: "__cxx_global_array_dtor",{{.*}} line: 13,{{.*}} isLocal: true, isDefinition: true +// CHECK-NOKEXT: !DISubprogram(name: "__dtor_array",{{.*}} line: 13,{{.*}} isLocal: true, isDefinition: true +// CHECK-NOKEXT: !DISubprogram(name: "__dtor__ZZ3foovE4stat",{{.*}} line: 16,{{.*}} isLocal: true, isDefinition: true +// CHECK-NOKEXT: !DISubprogram({{.*}} isLocal: true, isDefinition: true -// CHECK-KEXT: !MDSubprogram({{.*}} isLocal: true, isDefinition: true +// CHECK-KEXT: !DISubprogram({{.*}} isLocal: true, isDefinition: true diff --git a/clang/test/CodeGenCXX/debug-info-global.cpp b/clang/test/CodeGenCXX/debug-info-global.cpp index d0e8cb542d1..8292361eea8 100644 --- a/clang/test/CodeGenCXX/debug-info-global.cpp +++ b/clang/test/CodeGenCXX/debug-info-global.cpp @@ -10,12 +10,12 @@ int f1() { return ns::cnst + ns::cnst; } -// CHECK: !MDCompileUnit( +// CHECK: !DICompileUnit( // CHECK-SAME: globals: [[GLOBALS:![0-9]*]] // CHECK: [[GLOBALS]] = !{[[CNST:![0-9]*]]} -// CHECK: [[CNST]] = !MDGlobalVariable(name: "cnst", +// CHECK: [[CNST]] = !DIGlobalVariable(name: "cnst", // CHECK-SAME: scope: [[NS:![0-9]*]] -// CHECK: [[NS]] = !MDNamespace(name: "ns" +// CHECK: [[NS]] = !DINamespace(name: "ns" diff --git a/clang/test/CodeGenCXX/debug-info-globalinit.cpp b/clang/test/CodeGenCXX/debug-info-globalinit.cpp index efba958c9ed..edea3ae35ef 100644 --- a/clang/test/CodeGenCXX/debug-info-globalinit.cpp +++ b/clang/test/CodeGenCXX/debug-info-globalinit.cpp @@ -34,5 +34,5 @@ int main(void) {} // CHECK-NOT: __cxx_global_var_init // CHECK: store i32 %[[C2]], i32* @_ZL1k, align 4, !dbg // -// CHECK: ![[LINE]] = !MDLocation(line: 13, -// CHECK: ![[LINE2]] = !MDLocation(line: 15, +// CHECK: ![[LINE]] = !DILocation(line: 13, +// CHECK: ![[LINE2]] = !DILocation(line: 15, diff --git a/clang/test/CodeGenCXX/debug-info-indirect-field-decl.cpp b/clang/test/CodeGenCXX/debug-info-indirect-field-decl.cpp index 87868ebe0ef..08f71d4b1e1 100644 --- a/clang/test/CodeGenCXX/debug-info-indirect-field-decl.cpp +++ b/clang/test/CodeGenCXX/debug-info-indirect-field-decl.cpp @@ -7,13 +7,13 @@ template <class T, int T::*ptr> class Foo { }; struct Bar { int i1; - // CHECK: ![[INT:[0-9]+]] = !MDBasicType(name: "int" - // CHECK: !MDDerivedType(tag: DW_TAG_member, scope: + // CHECK: ![[INT:[0-9]+]] = !DIBasicType(name: "int" + // CHECK: !DIDerivedType(tag: DW_TAG_member, scope: // CHECK-SAME: line: [[@LINE+3]] // CHECK-SAME: baseType: !"_ZTSN3BarUt_E" // CHECK-SAME: size: 32, align: 32, offset: 32 union { - // CHECK: !MDDerivedType(tag: DW_TAG_member, name: "i2", + // CHECK: !DIDerivedType(tag: DW_TAG_member, name: "i2", // CHECK-SAME: line: [[@LINE+5]] // CHECK-SAME: baseType: ![[INT]] // CHECK-SAME: size: 32, align: 32 diff --git a/clang/test/CodeGenCXX/debug-info-limited.cpp b/clang/test/CodeGenCXX/debug-info-limited.cpp index 63f6bda3a23..d56e5b670a1 100644 --- a/clang/test/CodeGenCXX/debug-info-limited.cpp +++ b/clang/test/CodeGenCXX/debug-info-limited.cpp @@ -1,6 +1,6 @@ // RUN: %clang -flimit-debug-info -emit-llvm -g -S %s -o - | FileCheck %s -// CHECK: !MDCompositeType(tag: DW_TAG_class_type, name: "A" +// CHECK: !DICompositeType(tag: DW_TAG_class_type, name: "A" // CHECK-NOT: DIFlagFwdDecl // CHECK-SAME: ){{$}} class A { @@ -13,7 +13,7 @@ A *foo (A* x) { return a; } -// CHECK: !MDCompositeType(tag: DW_TAG_class_type, name: "B" +// CHECK: !DICompositeType(tag: DW_TAG_class_type, name: "B" // CHECK-NOT: DIFlagFwdDecl // CHECK-SAME: ){{$}} @@ -28,7 +28,7 @@ int baz(B *b) { } -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "C" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "C" // CHECK-SAME: flags: DIFlagFwdDecl struct C { diff --git a/clang/test/CodeGenCXX/debug-info-line-if.cpp b/clang/test/CodeGenCXX/debug-info-line-if.cpp index d0205af92bf..71097259df6 100644 --- a/clang/test/CodeGenCXX/debug-info-line-if.cpp +++ b/clang/test/CodeGenCXX/debug-info-line-if.cpp @@ -48,8 +48,8 @@ int main() { // CHECK: br label // CHECK: br label {{.*}}, !dbg [[DBG4:!.*]] - // CHECK: [[DBG1]] = !MDLocation(line: 100, scope: !{{.*}}) - // CHECK: [[DBG2]] = !MDLocation(line: 200, scope: !{{.*}}) - // CHECK: [[DBG3]] = !MDLocation(line: 300, scope: !{{.*}}) - // CHECK: [[DBG4]] = !MDLocation(line: 401, scope: !{{.*}}) + // CHECK: [[DBG1]] = !DILocation(line: 100, scope: !{{.*}}) + // CHECK: [[DBG2]] = !DILocation(line: 200, scope: !{{.*}}) + // CHECK: [[DBG3]] = !DILocation(line: 300, scope: !{{.*}}) + // CHECK: [[DBG4]] = !DILocation(line: 401, scope: !{{.*}}) } diff --git a/clang/test/CodeGenCXX/debug-info-line.cpp b/clang/test/CodeGenCXX/debug-info-line.cpp index 98b99d55b3c..0b1b43b86f3 100644 --- a/clang/test/CodeGenCXX/debug-info-line.cpp +++ b/clang/test/CodeGenCXX/debug-info-line.cpp @@ -293,32 +293,32 @@ void f24() { f24_a(); } -// CHECK: [[DBG_F1]] = !MDLocation(line: 100, -// CHECK: [[DBG_FOO_VALUE]] = !MDLocation(line: 200, -// CHECK: [[DBG_FOO_REF]] = !MDLocation(line: 202, -// CHECK: [[DBG_FOO_COMPLEX]] = !MDLocation(line: 204, -// CHECK: [[DBG_F2]] = !MDLocation(line: 300, -// CHECK: [[DBG_F3]] = !MDLocation(line: 400, -// CHECK: [[DBG_F4]] = !MDLocation(line: 500, -// CHECK: [[DBG_F5]] = !MDLocation(line: 600, -// CHECK: [[DBG_F6]] = !MDLocation(line: 700, -// CHECK: [[DBG_F7]] = !MDLocation(line: 800, -// CHECK: [[DBG_F8]] = !MDLocation(line: 900, -// CHECK: [[DBG_F9]] = !MDLocation(line: 1000, -// CHECK: [[DBG_F10_STORE]] = !MDLocation(line: 1100, -// CHECK: [[DBG_GLBL_CTOR_B]] = !MDLocation(line: 1200, -// CHECK: [[DBG_GLBL_DTOR_B]] = !MDLocation(line: 1200, -// CHECK: [[DBG_F11]] = !MDLocation(line: 1300, -// CHECK: [[DBG_F12]] = !MDLocation(line: 1400, -// CHECK: [[DBG_F13]] = !MDLocation(line: 1500, -// CHECK: [[DBG_F14_CTOR_CALL]] = !MDLocation(line: 1600, -// CHECK: [[DBG_F15]] = !MDLocation(line: 1700, -// CHECK: [[DBG_F16]] = !MDLocation(line: 1800, -// CHECK: [[DBG_F17]] = !MDLocation(line: 1900, -// CHECK: [[DBG_F18_1]] = !MDLocation(line: 2000, -// CHECK: [[DBG_F18_2]] = !MDLocation(line: 2001, -// CHECK: [[DBG_F19_1]] = !MDLocation(line: 2100, -// CHECK: [[DBG_F19_2]] = !MDLocation(line: 2101, -// CHECK: [[DBG_F20_1]] = !MDLocation(line: 2200, -// CHECK: [[DBG_F23]] = !MDLocation(line: 2500, -// CHECK: [[DBG_F24]] = !MDLocation(line: 2600, +// CHECK: [[DBG_F1]] = !DILocation(line: 100, +// CHECK: [[DBG_FOO_VALUE]] = !DILocation(line: 200, +// CHECK: [[DBG_FOO_REF]] = !DILocation(line: 202, +// CHECK: [[DBG_FOO_COMPLEX]] = !DILocation(line: 204, +// CHECK: [[DBG_F2]] = !DILocation(line: 300, +// CHECK: [[DBG_F3]] = !DILocation(line: 400, +// CHECK: [[DBG_F4]] = !DILocation(line: 500, +// CHECK: [[DBG_F5]] = !DILocation(line: 600, +// CHECK: [[DBG_F6]] = !DILocation(line: 700, +// CHECK: [[DBG_F7]] = !DILocation(line: 800, +// CHECK: [[DBG_F8]] = !DILocation(line: 900, +// CHECK: [[DBG_F9]] = !DILocation(line: 1000, +// CHECK: [[DBG_F10_STORE]] = !DILocation(line: 1100, +// CHECK: [[DBG_GLBL_CTOR_B]] = !DILocation(line: 1200, +// CHECK: [[DBG_GLBL_DTOR_B]] = !DILocation(line: 1200, +// CHECK: [[DBG_F11]] = !DILocation(line: 1300, +// CHECK: [[DBG_F12]] = !DILocation(line: 1400, +// CHECK: [[DBG_F13]] = !DILocation(line: 1500, +// CHECK: [[DBG_F14_CTOR_CALL]] = !DILocation(line: 1600, +// CHECK: [[DBG_F15]] = !DILocation(line: 1700, +// CHECK: [[DBG_F16]] = !DILocation(line: 1800, +// CHECK: [[DBG_F17]] = !DILocation(line: 1900, +// CHECK: [[DBG_F18_1]] = !DILocation(line: 2000, +// CHECK: [[DBG_F18_2]] = !DILocation(line: 2001, +// CHECK: [[DBG_F19_1]] = !DILocation(line: 2100, +// CHECK: [[DBG_F19_2]] = !DILocation(line: 2101, +// CHECK: [[DBG_F20_1]] = !DILocation(line: 2200, +// CHECK: [[DBG_F23]] = !DILocation(line: 2500, +// CHECK: [[DBG_F24]] = !DILocation(line: 2600, diff --git a/clang/test/CodeGenCXX/debug-info-method.cpp b/clang/test/CodeGenCXX/debug-info-method.cpp index 103a40241be..3ce05bd2d6b 100644 --- a/clang/test/CodeGenCXX/debug-info-method.cpp +++ b/clang/test/CodeGenCXX/debug-info-method.cpp @@ -1,16 +1,16 @@ // RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -std=c++11 -g %s -o - | FileCheck %s -// CHECK: !MDCompositeType(tag: DW_TAG_class_type, name: "A",{{.*}} identifier: "_ZTS1A") -// CHECK: !MDSubprogram(name: "foo", linkageName: "_ZN1A3fooEiS_3$_0" +// CHECK: !DICompositeType(tag: DW_TAG_class_type, name: "A",{{.*}} identifier: "_ZTS1A") +// CHECK: !DISubprogram(name: "foo", linkageName: "_ZN1A3fooEiS_3$_0" // CHECK-SAME: DIFlagProtected -// CHECK: ![[THISTYPE:[0-9]+]] = !MDDerivedType(tag: DW_TAG_pointer_type, baseType: !"_ZTS1A" +// CHECK: ![[THISTYPE:[0-9]+]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !"_ZTS1A" // CHECK-SAME: DIFlagArtificial -// CHECK: !MDDerivedType(tag: DW_TAG_ptr_to_member_type -// CHECK: !MDDerivedType(tag: DW_TAG_ptr_to_member_type, baseType: ![[MEMFUNTYPE:[0-9]+]] -// CHECK: ![[MEMFUNTYPE]] = !MDSubroutineType(types: ![[MEMFUNARGS:[0-9]+]]) +// CHECK: !DIDerivedType(tag: DW_TAG_ptr_to_member_type +// CHECK: !DIDerivedType(tag: DW_TAG_ptr_to_member_type, baseType: ![[MEMFUNTYPE:[0-9]+]] +// CHECK: ![[MEMFUNTYPE]] = !DISubroutineType(types: ![[MEMFUNARGS:[0-9]+]]) // CHECK: ![[MEMFUNARGS]] = {{.*}}, ![[THISTYPE]], -// CHECK: !MDLocalVariable(tag: DW_TAG_arg_variable -// CHECK: !MDLocalVariable(tag: DW_TAG_arg_variable -// CHECK: !MDLocalVariable(tag: DW_TAG_arg_variable +// CHECK: !DILocalVariable(tag: DW_TAG_arg_variable +// CHECK: !DILocalVariable(tag: DW_TAG_arg_variable +// CHECK: !DILocalVariable(tag: DW_TAG_arg_variable union { int a; float b; diff --git a/clang/test/CodeGenCXX/debug-info-namespace.cpp b/clang/test/CodeGenCXX/debug-info-namespace.cpp index 60f861186bd..d59b778676c 100644 --- a/clang/test/CodeGenCXX/debug-info-namespace.cpp +++ b/clang/test/CodeGenCXX/debug-info-namespace.cpp @@ -55,59 +55,59 @@ void B::func_fwd() {} // This should work even if 'i' and 'func' were declarations & not definitions, // but it doesn't yet. -// CHECK: [[CU:![0-9]+]] = !MDCompileUnit( +// CHECK: [[CU:![0-9]+]] = !DICompileUnit( // CHECK-SAME: imports: [[MODULES:![0-9]*]] -// CHECK: [[FOO:![0-9]+]] = !MDCompositeType(tag: DW_TAG_structure_type, name: "foo", +// CHECK: [[FOO:![0-9]+]] = !DICompositeType(tag: DW_TAG_structure_type, name: "foo", // CHECK-SAME: line: 5 // CHECK-SAME: DIFlagFwdDecl -// CHECK: [[FOOCPP:![0-9]+]] = !MDFile(filename: "foo.cpp" -// CHECK: [[NS:![0-9]+]] = !MDNamespace(name: "B", scope: [[CTXT:![0-9]+]], file: [[FOOCPP]], line: 1) -// CHECK: [[CTXT]] = !MDNamespace(name: "A", scope: null, file: [[FILE:![0-9]+]], line: 5) -// CHECK: [[FILE]] = !MDFile(filename: "{{.*}}debug-info-namespace.cpp", -// CHECK: [[BAR:![0-9]+]] = !MDCompositeType(tag: DW_TAG_structure_type, name: "bar", +// CHECK: [[FOOCPP:![0-9]+]] = !DIFile(filename: "foo.cpp" +// CHECK: [[NS:![0-9]+]] = !DINamespace(name: "B", scope: [[CTXT:![0-9]+]], file: [[FOOCPP]], line: 1) +// CHECK: [[CTXT]] = !DINamespace(name: "A", scope: null, file: [[FILE:![0-9]+]], line: 5) +// CHECK: [[FILE]] = !DIFile(filename: "{{.*}}debug-info-namespace.cpp", +// CHECK: [[BAR:![0-9]+]] = !DICompositeType(tag: DW_TAG_structure_type, name: "bar", // CHECK-SAME: line: 6 // CHECK-SAME: DIFlagFwdDecl -// CHECK: [[F1:![0-9]+]] = !MDSubprogram(name: "f1",{{.*}} line: 4 +// CHECK: [[F1:![0-9]+]] = !DISubprogram(name: "f1",{{.*}} line: 4 // CHECK-SAME: isDefinition: true -// CHECK: [[FUNC:![0-9]+]] = !MDSubprogram(name: "func",{{.*}} isDefinition: true -// CHECK: [[FUNC_FWD:![0-9]+]] = !MDSubprogram(name: "func_fwd",{{.*}} line: 47,{{.*}} isDefinition: true -// CHECK: [[I:![0-9]+]] = !MDGlobalVariable(name: "i",{{.*}} scope: [[NS]], -// CHECK: [[VAR_FWD:![0-9]+]] = !MDGlobalVariable(name: "var_fwd",{{.*}} scope: [[NS]], +// CHECK: [[FUNC:![0-9]+]] = !DISubprogram(name: "func",{{.*}} isDefinition: true +// CHECK: [[FUNC_FWD:![0-9]+]] = !DISubprogram(name: "func_fwd",{{.*}} line: 47,{{.*}} isDefinition: true +// CHECK: [[I:![0-9]+]] = !DIGlobalVariable(name: "i",{{.*}} scope: [[NS]], +// CHECK: [[VAR_FWD:![0-9]+]] = !DIGlobalVariable(name: "var_fwd",{{.*}} scope: [[NS]], // CHECK-SAME: line: 44 // CHECK-SAME: isDefinition: true // CHECK: [[MODULES]] = !{[[M1:![0-9]+]], [[M2:![0-9]+]], [[M3:![0-9]+]], [[M4:![0-9]+]], [[M5:![0-9]+]], [[M6:![0-9]+]], [[M7:![0-9]+]], [[M8:![0-9]+]], [[M9:![0-9]+]], [[M10:![0-9]+]], [[M11:![0-9]+]], [[M12:![0-9]+]], [[M13:![0-9]+]], [[M14:![0-9]+]], [[M15:![0-9]+]], [[M16:![0-9]+]], [[M17:![0-9]+]]} -// CHECK: [[M1]] = !MDImportedEntity(tag: DW_TAG_imported_module, scope: [[CTXT]], entity: [[NS]], line: 15) -// CHECK: [[M2]] = !MDImportedEntity(tag: DW_TAG_imported_module, scope: [[CU]], entity: [[CTXT]], -// CHECK: [[M3]] = !MDImportedEntity(tag: DW_TAG_imported_declaration, name: "E", scope: [[CU]], entity: [[CTXT]], line: 19) -// CHECK: [[M4]] = !MDImportedEntity(tag: DW_TAG_imported_module, scope: [[LEX2:![0-9]+]], entity: [[NS]], line: 23) -// CHECK: [[LEX2]] = distinct !MDLexicalBlock(scope: [[LEX1:![0-9]+]], file: [[FOOCPP]], -// CHECK: [[LEX1]] = distinct !MDLexicalBlock(scope: [[FUNC]], file: [[FOOCPP]], -// CHECK: [[M5]] = !MDImportedEntity(tag: DW_TAG_imported_module, scope: [[FUNC]], entity: [[CTXT]], -// CHECK: [[M6]] = !MDImportedEntity(tag: DW_TAG_imported_declaration, scope: [[FUNC]], entity: [[FOO:!"_ZTSN1A1B3fooE"]], line: 27) -// CHECK: [[M7]] = !MDImportedEntity(tag: DW_TAG_imported_declaration, scope: [[FUNC]], entity: [[BAR:!"_ZTSN1A1B3barE"]] -// CHECK: [[M8]] = !MDImportedEntity(tag: DW_TAG_imported_declaration, scope: [[FUNC]], entity: [[F1]] -// CHECK: [[M9]] = !MDImportedEntity(tag: DW_TAG_imported_declaration, scope: [[FUNC]], entity: [[I]] -// CHECK: [[M10]] = !MDImportedEntity(tag: DW_TAG_imported_declaration, scope: [[FUNC]], entity: [[BAZ:![0-9]+]] -// CHECK: [[BAZ]] = !MDDerivedType(tag: DW_TAG_typedef, name: "baz", scope: [[NS]], file: [[FOOCPP]], +// CHECK: [[M1]] = !DIImportedEntity(tag: DW_TAG_imported_module, scope: [[CTXT]], entity: [[NS]], line: 15) +// CHECK: [[M2]] = !DIImportedEntity(tag: DW_TAG_imported_module, scope: [[CU]], entity: [[CTXT]], +// CHECK: [[M3]] = !DIImportedEntity(tag: DW_TAG_imported_declaration, name: "E", scope: [[CU]], entity: [[CTXT]], line: 19) +// CHECK: [[M4]] = !DIImportedEntity(tag: DW_TAG_imported_module, scope: [[LEX2:![0-9]+]], entity: [[NS]], line: 23) +// CHECK: [[LEX2]] = distinct !DILexicalBlock(scope: [[LEX1:![0-9]+]], file: [[FOOCPP]], +// CHECK: [[LEX1]] = distinct !DILexicalBlock(scope: [[FUNC]], file: [[FOOCPP]], +// CHECK: [[M5]] = !DIImportedEntity(tag: DW_TAG_imported_module, scope: [[FUNC]], entity: [[CTXT]], +// CHECK: [[M6]] = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: [[FUNC]], entity: [[FOO:!"_ZTSN1A1B3fooE"]], line: 27) +// CHECK: [[M7]] = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: [[FUNC]], entity: [[BAR:!"_ZTSN1A1B3barE"]] +// CHECK: [[M8]] = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: [[FUNC]], entity: [[F1]] +// CHECK: [[M9]] = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: [[FUNC]], entity: [[I]] +// CHECK: [[M10]] = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: [[FUNC]], entity: [[BAZ:![0-9]+]] +// CHECK: [[BAZ]] = !DIDerivedType(tag: DW_TAG_typedef, name: "baz", scope: [[NS]], file: [[FOOCPP]], // CHECK-SAME: baseType: !"_ZTSN1A1B3barE" -// CHECK: [[M11]] = !MDImportedEntity(tag: DW_TAG_imported_declaration, name: "X", scope: [[FUNC]], entity: [[CTXT]] -// CHECK: [[M12]] = !MDImportedEntity(tag: DW_TAG_imported_declaration, name: "Y", scope: [[FUNC]], entity: [[M11]] -// CHECK: [[M13]] = !MDImportedEntity(tag: DW_TAG_imported_declaration, scope: [[FUNC]], entity: [[VAR_DECL:![0-9]+]] -// CHECK: [[VAR_DECL]] = !MDGlobalVariable(name: "var_decl", linkageName: "_ZN1A1B8var_declE", scope: [[NS]],{{.*}} line: 8, -// CHECK: [[M14]] = !MDImportedEntity(tag: DW_TAG_imported_declaration, scope: [[FUNC]], entity: [[FUNC_DECL:![0-9]+]] -// CHECK: [[FUNC_DECL]] = !MDSubprogram(name: "func_decl", +// CHECK: [[M11]] = !DIImportedEntity(tag: DW_TAG_imported_declaration, name: "X", scope: [[FUNC]], entity: [[CTXT]] +// CHECK: [[M12]] = !DIImportedEntity(tag: DW_TAG_imported_declaration, name: "Y", scope: [[FUNC]], entity: [[M11]] +// CHECK: [[M13]] = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: [[FUNC]], entity: [[VAR_DECL:![0-9]+]] +// CHECK: [[VAR_DECL]] = !DIGlobalVariable(name: "var_decl", linkageName: "_ZN1A1B8var_declE", scope: [[NS]],{{.*}} line: 8, +// CHECK: [[M14]] = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: [[FUNC]], entity: [[FUNC_DECL:![0-9]+]] +// CHECK: [[FUNC_DECL]] = !DISubprogram(name: "func_decl", // CHECK-SAME: scope: [[NS]], file: [[FOOCPP]], line: 9 -// CHECK: [[M15]] = !MDImportedEntity(tag: DW_TAG_imported_declaration, scope: [[FUNC]], entity: [[VAR_FWD:![0-9]+]] -// CHECK: [[M16]] = !MDImportedEntity(tag: DW_TAG_imported_declaration, scope: [[FUNC]], entity: [[FUNC_FWD:![0-9]+]] -// CHECK: [[M17]] = !MDImportedEntity(tag: DW_TAG_imported_declaration, scope: [[CTXT]], entity: [[I]] +// CHECK: [[M15]] = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: [[FUNC]], entity: [[VAR_FWD:![0-9]+]] +// CHECK: [[M16]] = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: [[FUNC]], entity: [[FUNC_FWD:![0-9]+]] +// CHECK: [[M17]] = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: [[CTXT]], entity: [[I]] -// CHECK-GMLT: [[CU:![0-9]+]] = !MDCompileUnit( +// CHECK-GMLT: [[CU:![0-9]+]] = !DICompileUnit( // CHECK-GMLT-SAME: emissionKind: 2, // CHECK-GMLT-SAME: imports: [[MODULES:![0-9]+]] // CHECK-GMLT: [[MODULES]] = !{} -// CHECK-NOLIMIT: !MDCompositeType(tag: DW_TAG_structure_type, name: "bar",{{.*}} line: 6, +// CHECK-NOLIMIT: !DICompositeType(tag: DW_TAG_structure_type, name: "bar",{{.*}} line: 6, // CHECK-NOLIMIT-NOT: DIFlagFwdDecl // CHECK-NOLIMIT-SAME: ){{$}} diff --git a/clang/test/CodeGenCXX/debug-info-nullptr.cpp b/clang/test/CodeGenCXX/debug-info-nullptr.cpp index 4816626452d..36baacc6dbe 100644 --- a/clang/test/CodeGenCXX/debug-info-nullptr.cpp +++ b/clang/test/CodeGenCXX/debug-info-nullptr.cpp @@ -4,4 +4,4 @@ void foo() { decltype(nullptr) t = 0; } -// CHECK: !MDBasicType(tag: DW_TAG_unspecified_type, name: "decltype(nullptr)") +// CHECK: !DIBasicType(tag: DW_TAG_unspecified_type, name: "decltype(nullptr)") diff --git a/clang/test/CodeGenCXX/debug-info-ptr-to-member-function.cpp b/clang/test/CodeGenCXX/debug-info-ptr-to-member-function.cpp index 90a6614588b..77b4ad2ed89 100644 --- a/clang/test/CodeGenCXX/debug-info-ptr-to-member-function.cpp +++ b/clang/test/CodeGenCXX/debug-info-ptr-to-member-function.cpp @@ -7,5 +7,5 @@ struct T { void foo(int (T::*method)()) {} // A pointer to a member function is a pair of function- and this-pointer. -// CHECK: !MDDerivedType(tag: DW_TAG_ptr_to_member_type, +// CHECK: !DIDerivedType(tag: DW_TAG_ptr_to_member_type, // CHECK-SAME: size: 128 diff --git a/clang/test/CodeGenCXX/debug-info-qualifiers.cpp b/clang/test/CodeGenCXX/debug-info-qualifiers.cpp index 8d3394cc468..9458e1f825e 100644 --- a/clang/test/CodeGenCXX/debug-info-qualifiers.cpp +++ b/clang/test/CodeGenCXX/debug-info-qualifiers.cpp @@ -2,35 +2,35 @@ // Test (r)value and CVR qualifiers on C++11 non-static member functions. class A { public: - // CHECK: !MDSubprogram(name: "l", + // CHECK: !DISubprogram(name: "l", // CHECK-SAME: line: [[@LINE+4]] // CHECK-SAME: type: ![[PLSR:[0-9]+]] // CHECK-SAME: flags: DIFlagPublic | DIFlagPrototyped | DIFlagLValueReference, - // CHECK: ![[PLSR]] = !MDSubroutineType(flags: DIFlagLValueReference, types: ![[ARGS:[0-9]+]]) + // CHECK: ![[PLSR]] = !DISubroutineType(flags: DIFlagLValueReference, types: ![[ARGS:[0-9]+]]) void l() const &; // CHECK: ![[ARGS]] = !{null, ![[THIS:[0-9]+]]} - // CHECK: ![[THIS]] = !MDDerivedType(tag: DW_TAG_pointer_type, baseType: ![[CONST_A:[0-9]+]] - // CHECK: ![[CONST_A]] = !MDDerivedType(tag: DW_TAG_const_type - // CHECK: !MDSubprogram(name: "r" + // CHECK: ![[THIS]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: ![[CONST_A:[0-9]+]] + // CHECK: ![[CONST_A]] = !DIDerivedType(tag: DW_TAG_const_type + // CHECK: !DISubprogram(name: "r" // CHECK-SAME: line: [[@LINE+4]] // CHECK-SAME: type: ![[PRSR:[0-9]+]] // CHECK-SAME: flags: DIFlagPublic | DIFlagPrototyped | DIFlagRValueReference, - // CHECK: ![[PRSR]] = !MDSubroutineType(flags: DIFlagRValueReference, types: ![[ARGS]]) + // CHECK: ![[PRSR]] = !DISubroutineType(flags: DIFlagRValueReference, types: ![[ARGS]]) void r() const &&; }; void g() { A a; // The type of pl is "void (A::*)() const &". - // CHECK: !MDLocalVariable(tag: DW_TAG_auto_variable, name: "pl", + // CHECK: !DILocalVariable(tag: DW_TAG_auto_variable, name: "pl", // CHECK-SAME: line: [[@LINE+3]] // CHECK-SAME: type: ![[PL:[0-9]+]] - // CHECK: !MDDerivedType(tag: DW_TAG_ptr_to_member_type, baseType: ![[PLSR]] + // CHECK: !DIDerivedType(tag: DW_TAG_ptr_to_member_type, baseType: ![[PLSR]] auto pl = &A::l; - // CHECK: !MDLocalVariable(tag: DW_TAG_auto_variable, name: "pr", + // CHECK: !DILocalVariable(tag: DW_TAG_auto_variable, name: "pr", // CHECK-SAME: line: [[@LINE+3]] // CHECK-SAME: type: ![[PR:[0-9]+]] - // CHECK: !MDDerivedType(tag: DW_TAG_ptr_to_member_type, baseType: ![[PRSR]] + // CHECK: !DIDerivedType(tag: DW_TAG_ptr_to_member_type, baseType: ![[PRSR]] auto pr = &A::r; } diff --git a/clang/test/CodeGenCXX/debug-info-rvalue-ref.cpp b/clang/test/CodeGenCXX/debug-info-rvalue-ref.cpp index 797e170cbee..00b5bcc20ad 100644 --- a/clang/test/CodeGenCXX/debug-info-rvalue-ref.cpp +++ b/clang/test/CodeGenCXX/debug-info-rvalue-ref.cpp @@ -8,5 +8,5 @@ void foo (int &&i) printf("%d\n", i); } -// CHECK: !MDDerivedType(tag: DW_TAG_rvalue_reference_type, baseType: ![[INT:[0-9]+]]) -// CHECK: ![[INT]] = !MDBasicType(name: "int" +// CHECK: !DIDerivedType(tag: DW_TAG_rvalue_reference_type, baseType: ![[INT:[0-9]+]]) +// CHECK: ![[INT]] = !DIBasicType(name: "int" diff --git a/clang/test/CodeGenCXX/debug-info-scope.cpp b/clang/test/CodeGenCXX/debug-info-scope.cpp index 9221ff7546b..478b7895e4e 100644 --- a/clang/test/CodeGenCXX/debug-info-scope.cpp +++ b/clang/test/CodeGenCXX/debug-info-scope.cpp @@ -9,31 +9,31 @@ int src(); void f(); void func() { - // CHECK: = !MDLocalVariable(tag: DW_TAG_auto_variable, name: "i" + // CHECK: = !DILocalVariable(tag: DW_TAG_auto_variable, name: "i" // CHECK-SAME: scope: [[IF1:![0-9]*]] // CHECK-SAME: line: [[@LINE+2]] - // CHECK: [[IF1]] = distinct !MDLexicalBlock({{.*}}line: [[@LINE+1]]) + // CHECK: [[IF1]] = distinct !DILexicalBlock({{.*}}line: [[@LINE+1]]) if (int i = src()) f(); - // CHECK: = !MDLocalVariable(tag: DW_TAG_auto_variable, name: "i" + // CHECK: = !DILocalVariable(tag: DW_TAG_auto_variable, name: "i" // CHECK-SAME: scope: [[IF2:![0-9]*]] // CHECK-SAME: line: [[@LINE+2]] - // CHECK: [[IF2]] = distinct !MDLexicalBlock({{.*}}line: [[@LINE+1]]) + // CHECK: [[IF2]] = distinct !DILexicalBlock({{.*}}line: [[@LINE+1]]) if (int i = src()) { f(); } else f(); - // CHECK: = !MDLocalVariable(tag: DW_TAG_auto_variable, name: "i" + // CHECK: = !DILocalVariable(tag: DW_TAG_auto_variable, name: "i" // CHECK-SAME: scope: [[FOR:![0-9]*]] // CHECK-SAME: line: [[@LINE+2]] - // CHECK: [[FOR]] = distinct !MDLexicalBlock({{.*}}line: [[@LINE+1]]) + // CHECK: [[FOR]] = distinct !DILexicalBlock({{.*}}line: [[@LINE+1]]) for (int i = 0; - // CHECK: = !MDLocalVariable(tag: DW_TAG_auto_variable, name: "b" + // CHECK: = !DILocalVariable(tag: DW_TAG_auto_variable, name: "b" // CHECK-SAME: scope: [[FOR_BODY:![0-9]*]] // CHECK-SAME: line: [[@LINE+6]] - // CHECK: [[FOR_BODY]] = distinct !MDLexicalBlock({{.*}}line: [[@LINE-4]]) + // CHECK: [[FOR_BODY]] = distinct !DILexicalBlock({{.*}}line: [[@LINE-4]]) // The scope could be located at 'bool b', but LLVM drops line information for // scopes anyway, so it's not terribly important. // FIXME: change the debug info schema to not include locations of scopes, @@ -41,32 +41,32 @@ void func() { bool b = i != 10; ++i) f(); - // CHECK: = !MDLocalVariable(tag: DW_TAG_auto_variable, name: "i" + // CHECK: = !DILocalVariable(tag: DW_TAG_auto_variable, name: "i" // CHECK-SAME: scope: [[FOR:![0-9]*]] // CHECK-SAME: line: [[@LINE+2]] - // CHECK: [[FOR]] = distinct !MDLexicalBlock({{.*}}line: [[@LINE+1]]) + // CHECK: [[FOR]] = distinct !DILexicalBlock({{.*}}line: [[@LINE+1]]) for (int i = 0; i != 10; ++i) { // FIXME: Do not include scopes that have only other scopes (and no variables // or using declarations) as direct children, they just waste // space/relocations/etc. - // CHECK: [[FOR_LOOP_INCLUDING_COND:!.*]] = distinct !MDLexicalBlock(scope: [[FOR]],{{.*}} line: [[@LINE-4]]) - // CHECK: = !MDLocalVariable(tag: DW_TAG_auto_variable, name: "b" + // CHECK: [[FOR_LOOP_INCLUDING_COND:!.*]] = distinct !DILexicalBlock(scope: [[FOR]],{{.*}} line: [[@LINE-4]]) + // CHECK: = !DILocalVariable(tag: DW_TAG_auto_variable, name: "b" // CHECK-SAME: scope: [[FOR_COMPOUND:![0-9]*]] // CHECK-SAME: line: [[@LINE+2]] - // CHECK: [[FOR_COMPOUND]] = distinct !MDLexicalBlock(scope: [[FOR_LOOP_INCLUDING_COND]],{{.*}} line: [[@LINE-8]]) + // CHECK: [[FOR_COMPOUND]] = distinct !DILexicalBlock(scope: [[FOR_LOOP_INCLUDING_COND]],{{.*}} line: [[@LINE-8]]) bool b = i % 2; } int x[] = {1, 2}; - // CHECK: = !MDLocalVariable(tag: DW_TAG_auto_variable, name: "__range" + // CHECK: = !DILocalVariable(tag: DW_TAG_auto_variable, name: "__range" // CHECK-SAME: scope: [[RANGE_FOR:![0-9]*]] // CHECK-NOT: line: // CHECK-SAME: ){{$}} - // CHECK: [[RANGE_FOR]] = distinct !MDLexicalBlock({{.*}}, line: [[@LINE+1]]) + // CHECK: [[RANGE_FOR]] = distinct !DILexicalBlock({{.*}}, line: [[@LINE+1]]) for (int i : x) { - // CHECK: = !MDLocalVariable(tag: DW_TAG_auto_variable, name: "i" + // CHECK: = !DILocalVariable(tag: DW_TAG_auto_variable, name: "i" // CHECK-SAME: scope: [[RANGE_FOR_BODY:![0-9]*]] // CHECK-SAME: line: [[@LINE-3]] - // CHECK: [[RANGE_FOR_BODY]] = distinct !MDLexicalBlock(scope: [[RANGE_FOR]],{{.*}} line: [[@LINE-4]]) + // CHECK: [[RANGE_FOR_BODY]] = distinct !DILexicalBlock(scope: [[RANGE_FOR]],{{.*}} line: [[@LINE-4]]) } } diff --git a/clang/test/CodeGenCXX/debug-info-static-fns.cpp b/clang/test/CodeGenCXX/debug-info-static-fns.cpp index f9d13b70999..3f8d8e83893 100644 --- a/clang/test/CodeGenCXX/debug-info-static-fns.cpp +++ b/clang/test/CodeGenCXX/debug-info-static-fns.cpp @@ -7,7 +7,7 @@ namespace A { } // Verify that a is present and mangled. -// CHECK: !MDSubprogram(name: "a", linkageName: "_ZN1AL1aEi", +// CHECK: !DISubprogram(name: "a", linkageName: "_ZN1AL1aEi", // CHECK-SAME: line: 4 // CHECK-SAME: isDefinition: true // CHECK-SAME: function: i32 (i32)* @_ZN1AL1aEi diff --git a/clang/test/CodeGenCXX/debug-info-static-member.cpp b/clang/test/CodeGenCXX/debug-info-static-member.cpp index 26f60b30173..8e5207d5c30 100644 --- a/clang/test/CodeGenCXX/debug-info-static-member.cpp +++ b/clang/test/CodeGenCXX/debug-info-static-member.cpp @@ -33,57 +33,57 @@ int main() // why the definition of "a" comes before the declarations while // "b" and "c" come after. -// CHECK: !MDCompositeType(tag: DW_TAG_enumeration_type, name: "X"{{.*}}, identifier: "_ZTS1X") -// CHECK: !MDCompositeType(tag: DW_TAG_class_type, name: "C"{{.*}}, identifier: "_ZTS1C") +// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "X"{{.*}}, identifier: "_ZTS1X") +// CHECK: !DICompositeType(tag: DW_TAG_class_type, name: "C"{{.*}}, identifier: "_ZTS1C") // -// CHECK: ![[DECL_A:[0-9]+]] = !MDDerivedType(tag: DW_TAG_member, name: "a" +// CHECK: ![[DECL_A:[0-9]+]] = !DIDerivedType(tag: DW_TAG_member, name: "a" // CHECK-NOT: size: // CHECK-NOT: align: // CHECK-NOT: offset: // CHECK-SAME: flags: DIFlagStaticMember) // -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "const_a" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "const_a" // CHECK-NOT: size: // CHECK-NOT: align: // CHECK-NOT: offset: // CHECK-SAME: flags: DIFlagStaticMember, // CHECK-SAME: extraData: i1 true) // -// CHECK: ![[DECL_B:[0-9]+]] = !MDDerivedType(tag: DW_TAG_member, name: "b" +// CHECK: ![[DECL_B:[0-9]+]] = !DIDerivedType(tag: DW_TAG_member, name: "b" // CHECK-NOT: size: // CHECK-NOT: align: // CHECK-NOT: offset: // CHECK-SAME: flags: DIFlagProtected | DIFlagStaticMember) // -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "const_b" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "const_b" // CHECK-NOT: size: // CHECK-NOT: align: // CHECK-NOT: offset: // CHECK-SAME: flags: DIFlagProtected | DIFlagStaticMember, // CHECK-SAME: extraData: float 0x{{.*}}) // -// CHECK: ![[DECL_C:[0-9]+]] = !MDDerivedType(tag: DW_TAG_member, name: "c" +// CHECK: ![[DECL_C:[0-9]+]] = !DIDerivedType(tag: DW_TAG_member, name: "c" // CHECK-NOT: size: // CHECK-NOT: align: // CHECK-NOT: offset: // CHECK-SAME: flags: DIFlagPublic | DIFlagStaticMember) // -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "const_c" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "const_c" // CHECK-NOT: size: // CHECK-NOT: align: // CHECK-NOT: offset: // CHECK-SAME: flags: DIFlagPublic | DIFlagStaticMember, // CHECK-SAME: extraData: i32 18) // -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "x_a" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "x_a" // CHECK-SAME: flags: DIFlagPublic | DIFlagStaticMember) -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "static_decl_templ<int>" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "static_decl_templ<int>" // CHECK-NOT: DIFlagFwdDecl // CHECK-SAME: ){{$}} -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "static_decl_templ_var" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "static_decl_templ_var" -// CHECK: [[NS_X:![0-9]+]] = !MDNamespace(name: "x" +// CHECK: [[NS_X:![0-9]+]] = !DINamespace(name: "x" // Test this in an anonymous namespace to ensure the type is retained even when // it doesn't get automatically retained by the string type reference machinery. @@ -94,8 +94,8 @@ struct anon_static_decl_struct { } -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "anon_static_decl_struct" -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "anon_static_decl_var" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "anon_static_decl_struct" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "anon_static_decl_var" int ref() { return anon_static_decl_struct::anon_static_decl_var; @@ -113,11 +113,11 @@ int static_decl_templ_ref() { return static_decl_templ<int>::static_decl_templ_var; } -// CHECK: !MDGlobalVariable(name: "a", {{.*}}variable: i32* @_ZN1C1aE, declaration: ![[DECL_A]]) -// CHECK: !MDGlobalVariable(name: "b", {{.*}}variable: i32* @_ZN1C1bE, declaration: ![[DECL_B]]) -// CHECK: !MDGlobalVariable(name: "c", {{.*}}variable: i32* @_ZN1C1cE, declaration: ![[DECL_C]]) +// CHECK: !DIGlobalVariable(name: "a", {{.*}}variable: i32* @_ZN1C1aE, declaration: ![[DECL_A]]) +// CHECK: !DIGlobalVariable(name: "b", {{.*}}variable: i32* @_ZN1C1bE, declaration: ![[DECL_B]]) +// CHECK: !DIGlobalVariable(name: "c", {{.*}}variable: i32* @_ZN1C1cE, declaration: ![[DECL_C]]) -// CHECK-NOT: !MDGlobalVariable(name: "anon_static_decl_var" +// CHECK-NOT: !DIGlobalVariable(name: "anon_static_decl_var" // Verify that even when a static member declaration is created lazily when // creating the definition, the declaration line is that of the canonical @@ -128,7 +128,7 @@ struct V { virtual ~V(); // cause the definition of 'V' to be omitted by no-standalone-debug optimization static const int const_va = 42; }; -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "const_va", +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "const_va", // CHECK-SAME: line: [[@LINE-3]] // CHECK-SAME: extraData: i32 42 const int V::const_va; @@ -140,5 +140,5 @@ struct y { int y::z; } -// CHECK: !MDGlobalVariable(name: "z", +// CHECK: !DIGlobalVariable(name: "z", // CHECK-SAME: scope: [[NS_X]] diff --git a/clang/test/CodeGenCXX/debug-info-template-explicit-specialization.cpp b/clang/test/CodeGenCXX/debug-info-template-explicit-specialization.cpp index 8168fd87729..4dadc4f5531 100644 --- a/clang/test/CodeGenCXX/debug-info-template-explicit-specialization.cpp +++ b/clang/test/CodeGenCXX/debug-info-template-explicit-specialization.cpp @@ -4,20 +4,20 @@ // type info at all. // RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -g %s -o - -gline-tables-only | FileCheck %s -check-prefix LINES-ONLY -// LINES-ONLY-NOT: !MDCompositeType(tag: DW_TAG_structure_type +// LINES-ONLY-NOT: !DICompositeType(tag: DW_TAG_structure_type template <typename T> struct a { }; extern template class a<int>; -// CHECK-NOT: MDCompositeType(tag: DW_TAG_structure_type, name: "a<int>" +// CHECK-NOT: DICompositeType(tag: DW_TAG_structure_type, name: "a<int>" template <typename T> struct b { }; extern template class b<int>; b<int> bi; -// CHECK: MDCompositeType(tag: DW_TAG_structure_type, name: "b<int>" +// CHECK: DICompositeType(tag: DW_TAG_structure_type, name: "b<int>" // CHECK-NOT: DIFlagFwdDecl // CHECK-SAME: ){{$}} @@ -27,7 +27,7 @@ struct c { }; extern template class c<int>; c<int> ci; -// CHECK: MDCompositeType(tag: DW_TAG_structure_type, name: "c<int>" +// CHECK: DICompositeType(tag: DW_TAG_structure_type, name: "c<int>" // CHECK-SAME: DIFlagFwdDecl template <typename T> @@ -36,7 +36,7 @@ struct d { }; extern template class d<int>; d<int> di; -// CHECK: MDCompositeType(tag: DW_TAG_structure_type, name: "d<int>" +// CHECK: DICompositeType(tag: DW_TAG_structure_type, name: "d<int>" // CHECK-NOT: DIFlagFwdDecl // CHECK-SAME: ){{$}} @@ -52,7 +52,7 @@ e<int> ei; // There's no guarantee that the out of line definition will appear before the // explicit template instantiation definition, so conservatively emit the type // definition here. -// CHECK: MDCompositeType(tag: DW_TAG_structure_type, name: "e<int>" +// CHECK: DICompositeType(tag: DW_TAG_structure_type, name: "e<int>" // CHECK-NOT: DIFlagFwdDecl // CHECK-SAME: ){{$}} @@ -65,7 +65,7 @@ template <typename T> void f<T>::g() { } f<int> fi; -// CHECK: MDCompositeType(tag: DW_TAG_structure_type, name: "f<int>" +// CHECK: DICompositeType(tag: DW_TAG_structure_type, name: "f<int>" // CHECK-NOT: DIFlagFwdDecl // CHECK-SAME: ){{$}} @@ -77,7 +77,7 @@ template <> void g<int>::f(); extern template class g<int>; g<int> gi; -// CHECK: MDCompositeType(tag: DW_TAG_structure_type, name: "g<int>" +// CHECK: DICompositeType(tag: DW_TAG_structure_type, name: "g<int>" // CHECK-NOT: DIFlagFwdDecl // CHECK-SAME: ){{$}} @@ -85,7 +85,7 @@ template <typename T> struct h { }; template class h<int>; -// CHECK: MDCompositeType(tag: DW_TAG_structure_type, name: "h<int>" +// CHECK: DICompositeType(tag: DW_TAG_structure_type, name: "h<int>" // CHECK-NOT: DIFlagFwdDecl // CHECK-SAME: ){{$}} @@ -96,7 +96,7 @@ struct i { template<> void i<int>::f(); extern template class i<int>; i<int> ii; -// CHECK: MDCompositeType(tag: DW_TAG_structure_type, name: "i<int>" +// CHECK: DICompositeType(tag: DW_TAG_structure_type, name: "i<int>" // CHECK-NOT: DIFlagFwdDecl // CHECK-SAME: ){{$}} @@ -105,7 +105,7 @@ struct j { }; extern template class j<int>; j<int> jj; -// CHECK: MDCompositeType(tag: DW_TAG_structure_type, name: "j<int, int>" +// CHECK: DICompositeType(tag: DW_TAG_structure_type, name: "j<int, int>" template <typename T> struct k { @@ -113,4 +113,4 @@ struct k { template <> struct k<int>; template struct k<int>; -// CHECK-NOT: !MDCompositeType(tag: DW_TAG_structure_type, name: "k<int>" +// CHECK-NOT: !DICompositeType(tag: DW_TAG_structure_type, name: "k<int>" diff --git a/clang/test/CodeGenCXX/debug-info-template-fwd.cpp b/clang/test/CodeGenCXX/debug-info-template-fwd.cpp index cede2853aa8..25daabce21c 100644 --- a/clang/test/CodeGenCXX/debug-info-template-fwd.cpp +++ b/clang/test/CodeGenCXX/debug-info-template-fwd.cpp @@ -2,7 +2,7 @@ // This test is for a crash when emitting debug info for not-yet-completed // types. // Test that we don't actually emit a forward decl for the offending class: -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "Derived<int>" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "Derived<int>" // CHECK-NOT: DIFlagFwdDecl // CHECK-SAME: ){{$}} // rdar://problem/15931354 diff --git a/clang/test/CodeGenCXX/debug-info-template-limit.cpp b/clang/test/CodeGenCXX/debug-info-template-limit.cpp index bb5e5abb5a6..2b493031148 100644 --- a/clang/test/CodeGenCXX/debug-info-template-limit.cpp +++ b/clang/test/CodeGenCXX/debug-info-template-limit.cpp @@ -1,8 +1,8 @@ // RUN: %clang_cc1 -emit-llvm -fno-standalone-debug -triple %itanium_abi_triple -g %s -o - | FileCheck %s // Check that this pointer type is TC<int> -// CHECK: ![[LINE:[0-9]+]] = !MDCompositeType(tag: DW_TAG_class_type, name: "TC<int>"{{.*}}, identifier: "_ZTS2TCIiE") -// CHECK: !MDDerivedType(tag: DW_TAG_pointer_type, baseType: !"_ZTS2TCIiE" +// CHECK: ![[LINE:[0-9]+]] = !DICompositeType(tag: DW_TAG_class_type, name: "TC<int>"{{.*}}, identifier: "_ZTS2TCIiE") +// CHECK: !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !"_ZTS2TCIiE" template<typename T> class TC { diff --git a/clang/test/CodeGenCXX/debug-info-template-member.cpp b/clang/test/CodeGenCXX/debug-info-template-member.cpp index dca32a316aa..dee82dce6be 100644 --- a/clang/test/CodeGenCXX/debug-info-template-member.cpp +++ b/clang/test/CodeGenCXX/debug-info-template-member.cpp @@ -16,38 +16,38 @@ inline int add3(int x) { return MyClass().add<3>(x); // even though add<3> is ODR used, don't emit it since we don't codegen it } -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "foo" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "foo" // CHECK-SAME: elements: [[FOO_MEM:![0-9]*]] // CHECK-SAME: identifier: "_ZTS3foo" // CHECK: [[FOO_MEM]] = !{[[FOO_FUNC:![0-9]*]]} -// CHECK: [[FOO_FUNC]] = !MDSubprogram(name: "func", linkageName: "_ZN3foo4funcEN5outerIS_E5innerE", +// CHECK: [[FOO_FUNC]] = !DISubprogram(name: "func", linkageName: "_ZN3foo4funcEN5outerIS_E5innerE", // CHECK-SAME: type: [[FOO_FUNC_TYPE:![0-9]*]] -// CHECK: [[FOO_FUNC_TYPE]] = !MDSubroutineType(types: [[FOO_FUNC_PARAMS:![0-9]*]]) +// CHECK: [[FOO_FUNC_TYPE]] = !DISubroutineType(types: [[FOO_FUNC_PARAMS:![0-9]*]]) // CHECK: [[FOO_FUNC_PARAMS]] = !{null, !{{[0-9]*}}, !"[[OUTER_FOO_INNER_ID:.*]]"} -// CHECK: !{{[0-9]*}} = !MDCompositeType(tag: DW_TAG_structure_type, name: "inner"{{.*}}, identifier: "[[OUTER_FOO_INNER_ID]]") +// CHECK: !{{[0-9]*}} = !DICompositeType(tag: DW_TAG_structure_type, name: "inner"{{.*}}, identifier: "[[OUTER_FOO_INNER_ID]]") -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "virt<elem>" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "virt<elem>" // CHECK-SAME: elements: [[VIRT_MEM:![0-9]*]] // CHECK-SAME: vtableHolder: !"_ZTS4virtI4elemE" // CHECK-SAME: templateParams: [[VIRT_TEMP_PARAM:![0-9]*]] // CHECK-SAME: identifier: "_ZTS4virtI4elemE" // CHECK: [[VIRT_TEMP_PARAM]] = !{[[VIRT_T:![0-9]*]]} -// CHECK: [[VIRT_T]] = !MDTemplateTypeParameter(name: "T", type: !"_ZTS4elem") +// CHECK: [[VIRT_T]] = !DITemplateTypeParameter(name: "T", type: !"_ZTS4elem") -// CHECK: [[C:![0-9]*]] = !MDCompositeType(tag: DW_TAG_structure_type, name: "MyClass" +// CHECK: [[C:![0-9]*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "MyClass" // CHECK-SAME: elements: [[C_MEM:![0-9]*]] // CHECK-SAME: vtableHolder: !"_ZTS7MyClass" // CHECK-SAME: identifier: "_ZTS7MyClass") // CHECK: [[C_MEM]] = !{[[C_VPTR:![0-9]*]], [[C_FUNC:![0-9]*]]} -// CHECK: [[C_VPTR]] = !MDDerivedType(tag: DW_TAG_member, name: "_vptr$MyClass" +// CHECK: [[C_VPTR]] = !DIDerivedType(tag: DW_TAG_member, name: "_vptr$MyClass" -// CHECK: [[C_FUNC]] = !MDSubprogram(name: "func",{{.*}} line: 7, +// CHECK: [[C_FUNC]] = !DISubprogram(name: "func",{{.*}} line: 7, -// CHECK: [[ELEM:![0-9]*]] = !MDCompositeType(tag: DW_TAG_structure_type, name: "elem" +// CHECK: [[ELEM:![0-9]*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "elem" // CHECK-SAME: elements: [[ELEM_MEM:![0-9]*]] // CHECK-SAME: identifier: "_ZTS4elem" // CHECK: [[ELEM_MEM]] = !{[[ELEM_X:![0-9]*]]} -// CHECK: [[ELEM_X]] = !MDDerivedType(tag: DW_TAG_member, name: "x", scope: !"_ZTS4elem" +// CHECK: [[ELEM_X]] = !DIDerivedType(tag: DW_TAG_member, name: "x", scope: !"_ZTS4elem" // CHECK-SAME: baseType: !"_ZTS4virtI4elemE" // Check that the member function template specialization and implicit special @@ -55,9 +55,9 @@ inline int add3(int x) { // didn't appear in the class's member list (C_MEM). This prevents the functions // from being added to type units, while still appearing in the type // declaration/reference in the compile unit. -// CHECK: !MDSubprogram(name: "MyClass" +// CHECK: !DISubprogram(name: "MyClass" // CHECK-SAME: scope: !"_ZTS7MyClass" -// CHECK: !MDSubprogram(name: "add<2>" +// CHECK: !DISubprogram(name: "add<2>" // CHECK-SAME: scope: !"_ZTS7MyClass" template<typename T> @@ -80,7 +80,7 @@ inline void func() { outer<foo>::inner x; -// CHECK: !MDGlobalVariable(name: "x", +// CHECK: !DIGlobalVariable(name: "x", // CHECK-SAME: type: !"[[OUTER_FOO_INNER_ID]]" // CHECK-SAME: variable: %"struct.outer<foo>::inner"* @x diff --git a/clang/test/CodeGenCXX/debug-info-template-partial-specialization.cpp b/clang/test/CodeGenCXX/debug-info-template-partial-specialization.cpp index d686b81e260..c184f049968 100644 --- a/clang/test/CodeGenCXX/debug-info-template-partial-specialization.cpp +++ b/clang/test/CodeGenCXX/debug-info-template-partial-specialization.cpp @@ -3,7 +3,7 @@ namespace __pointer_type_imp { template <class _Tp, class _Dp, bool > struct __pointer_type1 {}; - // CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "__pointer_type1<C, default_delete<C>, false>", + // CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "__pointer_type1<C, default_delete<C>, false>", // CHECK-SAME: templateParams: ![[PARAMS:[0-9]+]] // CHECK-SAME: identifier: "_ZTSN18__pointer_type_imp15__pointer_type1I1C14default_deleteIS1_ELb0EEE" template <class _Tp, class _Dp> struct __pointer_type1<_Tp, _Dp, false> @@ -17,7 +17,7 @@ struct __pointer_type2 // Test that the bool template type parameter is emitted. // // CHECK: ![[PARAMS]] = !{!{{.*}}, !{{.*}}, ![[FALSE:[0-9]+]]} - // CHECK: ![[FALSE]] = !MDTemplateValueParameter(type: !{{[0-9]+}}, value: i8 0) + // CHECK: ![[FALSE]] = !DITemplateValueParameter(type: !{{[0-9]+}}, value: i8 0) typedef typename __pointer_type_imp::__pointer_type1<_Tp, _Dp, false>::type type; }; template <class _Tp> struct default_delete {}; diff --git a/clang/test/CodeGenCXX/debug-info-template-quals.cpp b/clang/test/CodeGenCXX/debug-info-template-quals.cpp index beb03e8e71b..1f249117522 100644 --- a/clang/test/CodeGenCXX/debug-info-template-quals.cpp +++ b/clang/test/CodeGenCXX/debug-info-template-quals.cpp @@ -15,17 +15,17 @@ void foo (const char *c) { str.assign(c, str); } -// CHECK: [[BS:.*]] = !MDCompositeType(tag: DW_TAG_structure_type, name: "basic_string<char>" +// CHECK: [[BS:.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "basic_string<char>" // CHECK-SAME: line: 4 // CHECK-SAME: size: 8, align: 8 -// CHECK: [[TYPE:![0-9]*]] = !MDSubroutineType(types: [[ARGS:.*]]) +// CHECK: [[TYPE:![0-9]*]] = !DISubroutineType(types: [[ARGS:.*]]) // CHECK: [[ARGS]] = !{!{{.*}}, !{{.*}}, [[P:![0-9]*]], [[R:.*]]} -// CHECK: [[P]] = !MDDerivedType(tag: DW_TAG_pointer_type, baseType: [[CON:![0-9]*]] -// CHECK: [[CON]] = !MDDerivedType(tag: DW_TAG_const_type, baseType: [[CH:![0-9]*]] -// CHECK: [[CH]] = !MDBasicType(name: "char", size: 8, align: 8, encoding: DW_ATE_signed_char) +// CHECK: [[P]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: [[CON:![0-9]*]] +// CHECK: [[CON]] = !DIDerivedType(tag: DW_TAG_const_type, baseType: [[CH:![0-9]*]] +// CHECK: [[CH]] = !DIBasicType(name: "char", size: 8, align: 8, encoding: DW_ATE_signed_char) -// CHECK: [[R]] = !MDDerivedType(tag: DW_TAG_reference_type, baseType: [[CON2:![0-9]*]] -// CHECK: [[CON2]] = !MDDerivedType(tag: DW_TAG_const_type, baseType: !"_ZTS12basic_stringIcE" -// CHECK: !MDSubprogram(name: "assign" +// CHECK: [[R]] = !DIDerivedType(tag: DW_TAG_reference_type, baseType: [[CON2:![0-9]*]] +// CHECK: [[CON2]] = !DIDerivedType(tag: DW_TAG_const_type, baseType: !"_ZTS12basic_stringIcE" +// CHECK: !DISubprogram(name: "assign" // CHECK-SAME: line: 7 // CHECK-SAME: scopeLine: 8 diff --git a/clang/test/CodeGenCXX/debug-info-template.cpp b/clang/test/CodeGenCXX/debug-info-template.cpp index 306e070ec7b..74adef9a5f7 100644 --- a/clang/test/CodeGenCXX/debug-info-template.cpp +++ b/clang/test/CodeGenCXX/debug-info-template.cpp @@ -1,110 +1,110 @@ // RUN: %clang -S -emit-llvm -target x86_64-unknown_unknown -g %s -o - -std=c++11 | FileCheck %s -// CHECK: !MDCompileUnit( +// CHECK: !DICompileUnit( // CHECK-SAME: retainedTypes: [[RETAIN:![0-9]*]] // CHECK: [[EMPTY:![0-9]*]] = !{} // CHECK: [[RETAIN]] = !{!{{[0-9]]*}}, [[FOO:![0-9]*]], -// CHECK: [[TC:![0-9]*]] = !MDCompositeType(tag: DW_TAG_structure_type, name: "TC<unsigned int, 2, &glb, &foo::e, &foo::f, &foo::g, 1, 2, 3>" +// CHECK: [[TC:![0-9]*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "TC<unsigned int, 2, &glb, &foo::e, &foo::f, &foo::g, 1, 2, 3>" // CHECK-SAME: templateParams: [[TCARGS:![0-9]*]] // CHECK: [[TCARGS]] = !{[[TCARG1:![0-9]*]], [[TCARG2:![0-9]*]], [[TCARG3:![0-9]*]], [[TCARG4:![0-9]*]], [[TCARG5:![0-9]*]], [[TCARG6:![0-9]*]], [[TCARG7:![0-9]*]]} // -// CHECK: [[TCARG1]] = !MDTemplateTypeParameter(name: "T", type: [[UINT:![0-9]*]]) -// CHECK: [[UINT:![0-9]*]] = !MDBasicType(name: "unsigned int" -// CHECK: [[TCARG2]] = !MDTemplateValueParameter(type: [[UINT]], value: i32 2) -// CHECK: [[TCARG3]] = !MDTemplateValueParameter(name: "x", type: [[CINTPTR:![0-9]*]], value: i32* @glb) -// CHECK: [[CINTPTR]] = !MDDerivedType(tag: DW_TAG_pointer_type, {{.*}}baseType: [[CINT:![0-9]+]] -// CHECK: [[CINT]] = !MDDerivedType(tag: DW_TAG_const_type, {{.*}}baseType: [[INT:![0-9]+]] -// CHECK: [[INT]] = !MDBasicType(name: "int" -// CHECK: [[TCARG4]] = !MDTemplateValueParameter(name: "a", type: [[MEMINTPTR:![0-9]*]], value: i64 8) -// CHECK: [[MEMINTPTR]] = !MDDerivedType(tag: DW_TAG_ptr_to_member_type, {{.*}}baseType: [[INT]], {{.*}}extraData: !"_ZTS3foo") +// CHECK: [[TCARG1]] = !DITemplateTypeParameter(name: "T", type: [[UINT:![0-9]*]]) +// CHECK: [[UINT:![0-9]*]] = !DIBasicType(name: "unsigned int" +// CHECK: [[TCARG2]] = !DITemplateValueParameter(type: [[UINT]], value: i32 2) +// CHECK: [[TCARG3]] = !DITemplateValueParameter(name: "x", type: [[CINTPTR:![0-9]*]], value: i32* @glb) +// CHECK: [[CINTPTR]] = !DIDerivedType(tag: DW_TAG_pointer_type, {{.*}}baseType: [[CINT:![0-9]+]] +// CHECK: [[CINT]] = !DIDerivedType(tag: DW_TAG_const_type, {{.*}}baseType: [[INT:![0-9]+]] +// CHECK: [[INT]] = !DIBasicType(name: "int" +// CHECK: [[TCARG4]] = !DITemplateValueParameter(name: "a", type: [[MEMINTPTR:![0-9]*]], value: i64 8) +// CHECK: [[MEMINTPTR]] = !DIDerivedType(tag: DW_TAG_ptr_to_member_type, {{.*}}baseType: [[INT]], {{.*}}extraData: !"_ZTS3foo") // // Currently Clang emits the pointer-to-member-function value, but LLVM doesn't // use it (GCC doesn't emit a value for pointers to member functions either - so // it's not clear what, if any, format would be acceptable to GDB) // -// CHECK: [[TCARG5]] = !MDTemplateValueParameter(name: "b", type: [[MEMFUNPTR:![0-9]*]], value: { i64, i64 } { i64 ptrtoint (void (%struct.foo*)* @_ZN3foo1fEv to i64), i64 0 }) -// CHECK: [[MEMFUNPTR]] = !MDDerivedType(tag: DW_TAG_ptr_to_member_type, {{.*}}baseType: [[FTYPE:![0-9]*]], {{.*}}extraData: !"_ZTS3foo") -// CHECK: [[FTYPE]] = !MDSubroutineType(types: [[FARGS:![0-9]*]]) +// CHECK: [[TCARG5]] = !DITemplateValueParameter(name: "b", type: [[MEMFUNPTR:![0-9]*]], value: { i64, i64 } { i64 ptrtoint (void (%struct.foo*)* @_ZN3foo1fEv to i64), i64 0 }) +// CHECK: [[MEMFUNPTR]] = !DIDerivedType(tag: DW_TAG_ptr_to_member_type, {{.*}}baseType: [[FTYPE:![0-9]*]], {{.*}}extraData: !"_ZTS3foo") +// CHECK: [[FTYPE]] = !DISubroutineType(types: [[FARGS:![0-9]*]]) // CHECK: [[FARGS]] = !{null, [[FARG1:![0-9]*]]} -// CHECK: [[FARG1]] = !MDDerivedType(tag: DW_TAG_pointer_type, +// CHECK: [[FARG1]] = !DIDerivedType(tag: DW_TAG_pointer_type, // CHECK-SAME: baseType: !"_ZTS3foo" // CHECK-NOT: line: // CHECK-SAME: size: 64, align: 64 // CHECK-NOT: offset: 0 // CHECK-SAME: DIFlagArtificial // -// CHECK: [[TCARG6]] = !MDTemplateValueParameter(name: "f", type: [[FUNPTR:![0-9]*]], value: void ()* @_ZN3foo1gEv) -// CHECK: [[FUNPTR]] = !MDDerivedType(tag: DW_TAG_pointer_type, baseType: [[FUNTYPE:![0-9]*]] -// CHECK: [[FUNTYPE]] = !MDSubroutineType(types: [[FUNARGS:![0-9]*]]) +// CHECK: [[TCARG6]] = !DITemplateValueParameter(name: "f", type: [[FUNPTR:![0-9]*]], value: void ()* @_ZN3foo1gEv) +// CHECK: [[FUNPTR]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: [[FUNTYPE:![0-9]*]] +// CHECK: [[FUNTYPE]] = !DISubroutineType(types: [[FUNARGS:![0-9]*]]) // CHECK: [[FUNARGS]] = !{null} -// CHECK: [[TCARG7]] = !MDTemplateValueParameter(tag: DW_TAG_GNU_template_parameter_pack, name: "Is", value: [[TCARG7_VALS:![0-9]*]]) +// CHECK: [[TCARG7]] = !DITemplateValueParameter(tag: DW_TAG_GNU_template_parameter_pack, name: "Is", value: [[TCARG7_VALS:![0-9]*]]) // CHECK: [[TCARG7_VALS]] = !{[[TCARG7_1:![0-9]*]], [[TCARG7_2:![0-9]*]], [[TCARG7_3:![0-9]*]]} -// CHECK: [[TCARG7_1]] = !MDTemplateValueParameter(type: [[INT]], value: i32 1) -// CHECK: [[TCARG7_2]] = !MDTemplateValueParameter(type: [[INT]], value: i32 2) -// CHECK: [[TCARG7_3]] = !MDTemplateValueParameter(type: [[INT]], value: i32 3) +// CHECK: [[TCARG7_1]] = !DITemplateValueParameter(type: [[INT]], value: i32 1) +// CHECK: [[TCARG7_2]] = !DITemplateValueParameter(type: [[INT]], value: i32 2) +// CHECK: [[TCARG7_3]] = !DITemplateValueParameter(type: [[INT]], value: i32 3) // // We could just emit a declaration of 'foo' here, rather than the entire // definition (same goes for any time we emit a member (function or data) // pointer type) -// CHECK: [[FOO]] = !MDCompositeType(tag: DW_TAG_structure_type, name: "foo", {{.*}}identifier: "_ZTS3foo") -// CHECK: !MDSubprogram(name: "f", linkageName: "_ZN3foo1fEv", {{.*}}type: [[FTYPE:![0-9]*]] +// CHECK: [[FOO]] = !DICompositeType(tag: DW_TAG_structure_type, name: "foo", {{.*}}identifier: "_ZTS3foo") +// CHECK: !DISubprogram(name: "f", linkageName: "_ZN3foo1fEv", {{.*}}type: [[FTYPE:![0-9]*]] // -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "nested", +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "nested", // CHECK-SAME: scope: !"_ZTS2TCIjLj2EXadL_Z3glbEEXadL_ZN3foo1eEEEXadL_ZNS0_1fEvEEXadL_ZNS0_1gEvEEJLi1ELi2ELi3EEE" // CHECK-SAME: identifier: "[[TCNESTED:.*]]") -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "TC<int, -3, nullptr, nullptr, nullptr, nullptr>" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "TC<int, -3, nullptr, nullptr, nullptr, nullptr>" // CHECK-SAME: templateParams: [[TCNARGS:![0-9]*]] // CHECK-SAME: identifier: "[[TCNT:.*]]") // CHECK: [[TCNARGS]] = !{[[TCNARG1:![0-9]*]], [[TCNARG2:![0-9]*]], [[TCNARG3:![0-9]*]], [[TCNARG4:![0-9]*]], [[TCNARG5:![0-9]*]], [[TCNARG6:![0-9]*]], [[TCNARG7:![0-9]*]]} -// CHECK: [[TCNARG1]] = !MDTemplateTypeParameter(name: "T", type: [[INT]]) -// CHECK: [[TCNARG2]] = !MDTemplateValueParameter(type: [[INT]], value: i32 -3) -// CHECK: [[TCNARG3]] = !MDTemplateValueParameter(name: "x", type: [[CINTPTR]], value: i8 0) +// CHECK: [[TCNARG1]] = !DITemplateTypeParameter(name: "T", type: [[INT]]) +// CHECK: [[TCNARG2]] = !DITemplateValueParameter(type: [[INT]], value: i32 -3) +// CHECK: [[TCNARG3]] = !DITemplateValueParameter(name: "x", type: [[CINTPTR]], value: i8 0) // The interesting null pointer: -1 for member data pointers (since they are // just an offset in an object, they can be zero and non-null for the first // member) -// CHECK: [[TCNARG4]] = !MDTemplateValueParameter(name: "a", type: [[MEMINTPTR]], value: i64 -1) +// CHECK: [[TCNARG4]] = !DITemplateValueParameter(name: "a", type: [[MEMINTPTR]], value: i64 -1) // // In some future iteration we could possibly emit the value of a null member // function pointer as '{ i64, i64 } zeroinitializer' as it may be handled // naturally from the LLVM CodeGen side once we decide how to handle non-null // member function pointers. For now, it's simpler just to emit the 'i8 0'. // -// CHECK: [[TCNARG5]] = !MDTemplateValueParameter(name: "b", type: [[MEMFUNPTR]], value: i8 0) -// CHECK: [[TCNARG6]] = !MDTemplateValueParameter(name: "f", type: [[FUNPTR]], value: i8 0) -// CHECK: [[TCNARG7]] = !MDTemplateValueParameter(tag: DW_TAG_GNU_template_parameter_pack, name: "Is", value: [[EMPTY]]) +// CHECK: [[TCNARG5]] = !DITemplateValueParameter(name: "b", type: [[MEMFUNPTR]], value: i8 0) +// CHECK: [[TCNARG6]] = !DITemplateValueParameter(name: "f", type: [[FUNPTR]], value: i8 0) +// CHECK: [[TCNARG7]] = !DITemplateValueParameter(tag: DW_TAG_GNU_template_parameter_pack, name: "Is", value: [[EMPTY]]) // FIXME: these parameters should probably be rendered as 'glb' rather than // '&glb', since they're references, not pointers. -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "NN<tmpl_impl, &glb, &glb>", +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "NN<tmpl_impl, &glb, &glb>", // CHECK-SAME: templateParams: [[NNARGS:![0-9]*]] // CHECK-SAME: identifier: "[[NNT:.*]]") // CHECK: [[NNARGS]] = !{[[NNARG1:![0-9]*]], [[NNARG2:![0-9]*]], [[NNARG3:![0-9]*]]} -// CHECK: [[NNARG1]] = !MDTemplateValueParameter(tag: DW_TAG_GNU_template_template_param, name: "tmpl", value: !"tmpl_impl") -// CHECK: [[NNARG2]] = !MDTemplateValueParameter(name: "lvr", type: [[INTLVR:![0-9]*]], value: i32* @glb) -// CHECK: [[INTLVR]] = !MDDerivedType(tag: DW_TAG_reference_type, baseType: [[INT]] -// CHECK: [[NNARG3]] = !MDTemplateValueParameter(name: "rvr", type: [[INTRVR:![0-9]*]], value: i32* @glb) -// CHECK: [[INTRVR]] = !MDDerivedType(tag: DW_TAG_rvalue_reference_type, baseType: [[INT]] +// CHECK: [[NNARG1]] = !DITemplateValueParameter(tag: DW_TAG_GNU_template_template_param, name: "tmpl", value: !"tmpl_impl") +// CHECK: [[NNARG2]] = !DITemplateValueParameter(name: "lvr", type: [[INTLVR:![0-9]*]], value: i32* @glb) +// CHECK: [[INTLVR]] = !DIDerivedType(tag: DW_TAG_reference_type, baseType: [[INT]] +// CHECK: [[NNARG3]] = !DITemplateValueParameter(name: "rvr", type: [[INTRVR:![0-9]*]], value: i32* @glb) +// CHECK: [[INTRVR]] = !DIDerivedType(tag: DW_TAG_rvalue_reference_type, baseType: [[INT]] -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "PaddingAtEndTemplate<&PaddedObj>" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "PaddingAtEndTemplate<&PaddedObj>" // CHECK-SAME: templateParams: [[PTOARGS:![0-9]*]] // CHECK: [[PTOARGS]] = !{[[PTOARG1:![0-9]*]]} -// CHECK: [[PTOARG1]] = !MDTemplateValueParameter(type: [[CONST_PADDINGATEND_PTR:![0-9]*]], value: %struct.PaddingAtEnd* @PaddedObj) -// CHECK: [[CONST_PADDINGATEND_PTR]] = !MDDerivedType(tag: DW_TAG_pointer_type, baseType: !"_ZTS12PaddingAtEnd", size: 64, align: 64) +// CHECK: [[PTOARG1]] = !DITemplateValueParameter(type: [[CONST_PADDINGATEND_PTR:![0-9]*]], value: %struct.PaddingAtEnd* @PaddedObj) +// CHECK: [[CONST_PADDINGATEND_PTR]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !"_ZTS12PaddingAtEnd", size: 64, align: 64) -// CHECK: !MDGlobalVariable(name: "tci", +// CHECK: !DIGlobalVariable(name: "tci", // CHECK-SAME: type: !"[[TCNESTED]]" // CHECK-SAME: variable: %"struct.TC<unsigned int, 2, &glb, &foo::e, &foo::f, &foo::g, 1, 2, 3>::nested"* @tci -// CHECK: !MDGlobalVariable(name: "tcn" +// CHECK: !DIGlobalVariable(name: "tcn" // CHECK-SAME: type: !"[[TCNT]]" // CHECK-SAME: variable: %struct.TC* @tcn -// CHECK: !MDGlobalVariable(name: "nn" +// CHECK: !DIGlobalVariable(name: "nn" // CHECK-SAME: type: !"[[NNT]]" // CHECK-SAME: variable: %struct.NN* @nn struct foo { diff --git a/clang/test/CodeGenCXX/debug-info-thunk.cpp b/clang/test/CodeGenCXX/debug-info-thunk.cpp index b15f0ba7953..935110ffbdc 100644 --- a/clang/test/CodeGenCXX/debug-info-thunk.cpp +++ b/clang/test/CodeGenCXX/debug-info-thunk.cpp @@ -14,7 +14,7 @@ struct C : A, B { void C::f() { } -// CHECK: !MDSubprogram(linkageName: "_ZThn{{[48]}}_N1C1fEv" +// CHECK: !DISubprogram(linkageName: "_ZThn{{[48]}}_N1C1fEv" // CHECK-SAME: line: 15 // CHECK-SAME: isDefinition: true // CHECK-SAME: ){{$}} diff --git a/clang/test/CodeGenCXX/debug-info-union-template.cpp b/clang/test/CodeGenCXX/debug-info-union-template.cpp index 009ab041b9a..0616d724c9f 100644 --- a/clang/test/CodeGenCXX/debug-info-union-template.cpp +++ b/clang/test/CodeGenCXX/debug-info-union-template.cpp @@ -10,8 +10,8 @@ namespace PR15637 { Value<float> f; } -// CHECK: !MDCompositeType(tag: DW_TAG_union_type, name: "Value<float>", +// CHECK: !DICompositeType(tag: DW_TAG_union_type, name: "Value<float>", // CHECK-SAME: templateParams: [[TTPARAM:![0-9]+]] // CHECK-SAME: identifier: "_ZTSN7PR156375ValueIfEE" // CHECK: [[TTPARAM]] = !{[[PARAMS:.*]]} -// CHECK: [[PARAMS]] = !MDTemplateTypeParameter(name: "T" +// CHECK: [[PARAMS]] = !DITemplateTypeParameter(name: "T" diff --git a/clang/test/CodeGenCXX/debug-info-union.cpp b/clang/test/CodeGenCXX/debug-info-union.cpp index cc1dbdc8e39..a81a560e628 100644 --- a/clang/test/CodeGenCXX/debug-info-union.cpp +++ b/clang/test/CodeGenCXX/debug-info-union.cpp @@ -10,11 +10,11 @@ union E { E e; -// CHECK: !MDCompositeType(tag: DW_TAG_union_type, name: "E" +// CHECK: !DICompositeType(tag: DW_TAG_union_type, name: "E" // CHECK-SAME: line: 3 // CHECK-SAME: size: 32, align: 32 // CHECK-NOT: offset: // CHECK-SAME: {{$}} -// CHECK: !MDSubprogram(name: "bb"{{.*}}, line: 6 -// CHECK: !MDSubprogram(name: "aa"{{.*}}, line: 7 -// CHECK: !MDSubprogram(name: "E"{{.*}}, line: 8 +// CHECK: !DISubprogram(name: "bb"{{.*}}, line: 6 +// CHECK: !DISubprogram(name: "aa"{{.*}}, line: 7 +// CHECK: !DISubprogram(name: "E"{{.*}}, line: 8 diff --git a/clang/test/CodeGenCXX/debug-info-uuid.cpp b/clang/test/CodeGenCXX/debug-info-uuid.cpp index b6e72ae0aa3..fd6e31d7d5b 100644 --- a/clang/test/CodeGenCXX/debug-info-uuid.cpp +++ b/clang/test/CodeGenCXX/debug-info-uuid.cpp @@ -1,32 +1,32 @@ // RUN: %clang_cc1 -emit-llvm -fms-extensions -triple=x86_64-pc-win32 -g %s -o - -std=c++11 | FileCheck %s // RUN: %clang_cc1 -emit-llvm -fms-extensions -triple=x86_64-unknown-unknown -g %s -o - -std=c++11 2>&1 | FileCheck %s --check-prefix=CHECK-ITANIUM -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "tmpl_guid<&__uuidof(uuid)>" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "tmpl_guid<&__uuidof(uuid)>" // CHECK-SAME: templateParams: [[TGIARGS:![0-9]*]] // CHECK: [[TGIARGS]] = !{[[TGIARG1:![0-9]*]]} -// CHECK: [[TGIARG1]] = !MDTemplateValueParameter( +// CHECK: [[TGIARG1]] = !DITemplateValueParameter( // CHECK-SAME: type: [[CONST_GUID_PTR:![0-9]*]] // CHECK-SAME: value: { i32, i16, i16, [8 x i8] }* @_GUID_12345678_1234_1234_1234_1234567890ab -// CHECK: [[CONST_GUID_PTR]] = !MDDerivedType(tag: DW_TAG_pointer_type +// CHECK: [[CONST_GUID_PTR]] = !DIDerivedType(tag: DW_TAG_pointer_type // CHECK-SAME: baseType: [[CONST_GUID:![0-9]*]] // CHECK-SAME: size: 64 // CHECK-SAME: align: 64 -// CHECK: [[CONST_GUID]] = !MDDerivedType(tag: DW_TAG_const_type +// CHECK: [[CONST_GUID]] = !DIDerivedType(tag: DW_TAG_const_type // CHECK-SAME: baseType: [[GUID:![0-9]*]] -// CHECK: [[GUID]] = !MDCompositeType(tag: DW_TAG_structure_type, name: "_GUID" +// CHECK: [[GUID]] = !DICompositeType(tag: DW_TAG_structure_type, name: "_GUID" -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "tmpl_guid2<__uuidof(uuid)>" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "tmpl_guid2<__uuidof(uuid)>" // CHECK-SAME: templateParams: [[TGI2ARGS:![0-9]*]] // CHECK: [[TGI2ARGS]] = !{[[TGI2ARG1:![0-9]*]]} -// CHECK: [[TGI2ARG1]] = !MDTemplateValueParameter( +// CHECK: [[TGI2ARG1]] = !DITemplateValueParameter( // CHECK-SAME: type: [[CONST_GUID_REF:![0-9]*]] // CHECK-SAME: value: { i32, i16, i16, [8 x i8] }* @_GUID_12345678_1234_1234_1234_1234567890ab -// CHECK: [[CONST_GUID_REF]] = !MDDerivedType(tag: DW_TAG_reference_type, +// CHECK: [[CONST_GUID_REF]] = !DIDerivedType(tag: DW_TAG_reference_type, // CHECK-SAME: baseType: [[CONST_GUID:![0-9]*]] -// CHECK-ITANIUM: !MDCompositeType(tag: DW_TAG_structure_type, name: "tmpl_guid<&__uuidof(uuid)>" +// CHECK-ITANIUM: !DICompositeType(tag: DW_TAG_structure_type, name: "tmpl_guid<&__uuidof(uuid)>" // CHECK-ITANIUM-SAME: identifier: "_ZTS9tmpl_guidIXadu8__uuidoft4uuidEE" -// CHECK-ITANIUM: !MDCompositeType(tag: DW_TAG_structure_type, name: "tmpl_guid2<__uuidof(uuid)>" +// CHECK-ITANIUM: !DICompositeType(tag: DW_TAG_structure_type, name: "tmpl_guid2<__uuidof(uuid)>" // CHECK-ITANIUM-SAME: identifier: "_ZTS10tmpl_guid2IXu8__uuidoft4uuidEE" struct _GUID; diff --git a/clang/test/CodeGenCXX/debug-info-varargs.cpp b/clang/test/CodeGenCXX/debug-info-varargs.cpp index e51681e791d..edcb0e5a53d 100644 --- a/clang/test/CodeGenCXX/debug-info-varargs.cpp +++ b/clang/test/CodeGenCXX/debug-info-varargs.cpp @@ -2,27 +2,27 @@ struct A { - // CHECK: !MDSubprogram(name: "a", linkageName: "_ZN1A1aEiz" + // CHECK: !DISubprogram(name: "a", linkageName: "_ZN1A1aEiz" // CHECK-SAME: line: [[@LINE+2]] // CHECK-SAME: type: ![[ATY:[0-9]+]] void a(int c, ...) {} - // CHECK: ![[ATY]] = !MDSubroutineType(types: ![[AARGS:[0-9]+]]) + // CHECK: ![[ATY]] = !DISubroutineType(types: ![[AARGS:[0-9]+]]) // We no longer use an explicit unspecified parameter. Instead we use a trailing null to mean the function is variadic. // CHECK: ![[AARGS]] = !{null, !{{[0-9]+}}, !{{[0-9]+}}, null} }; - // CHECK: !MDSubprogram(name: "b", linkageName: "_Z1biz" + // CHECK: !DISubprogram(name: "b", linkageName: "_Z1biz" // CHECK-SAME: line: [[@LINE+2]] // CHECK-SAME: type: ![[BTY:[0-9]+]] void b(int c, ...) { - // CHECK: ![[BTY]] = !MDSubroutineType(types: ![[BARGS:[0-9]+]]) + // CHECK: ![[BTY]] = !DISubroutineType(types: ![[BARGS:[0-9]+]]) // CHECK: ![[BARGS]] = !{null, !{{[0-9]+}}, null} A a; - // CHECK: !MDLocalVariable(tag: DW_TAG_auto_variable, name: "fptr" + // CHECK: !DILocalVariable(tag: DW_TAG_auto_variable, name: "fptr" // CHECK-SAME: line: [[@LINE+2]] // CHECK-SAME: type: ![[PST:[0-9]+]] void (*fptr)(int, ...) = b; - // CHECK: ![[PST]] = !MDDerivedType(tag: DW_TAG_pointer_type, baseType: ![[BTY]], + // CHECK: ![[PST]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: ![[BTY]], } diff --git a/clang/test/CodeGenCXX/debug-info-vtable-optzn.cpp b/clang/test/CodeGenCXX/debug-info-vtable-optzn.cpp index cf2e60e2158..f15571eab99 100644 --- a/clang/test/CodeGenCXX/debug-info-vtable-optzn.cpp +++ b/clang/test/CodeGenCXX/debug-info-vtable-optzn.cpp @@ -5,7 +5,7 @@ // module that has its vtable" optimization is disabled by default on // Darwin and FreeBSD. // -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "lost" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "lost" class A { virtual bool f() = 0; diff --git a/clang/test/CodeGenCXX/debug-info-wchar.cpp b/clang/test/CodeGenCXX/debug-info-wchar.cpp index da7ce7f0061..bb01f575c59 100644 --- a/clang/test/CodeGenCXX/debug-info-wchar.cpp +++ b/clang/test/CodeGenCXX/debug-info-wchar.cpp @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -emit-llvm -g %s -o -| FileCheck %s void foo() { -// CHECK: !MDBasicType(name: "wchar_t" +// CHECK: !DIBasicType(name: "wchar_t" const wchar_t w = L'x'; } diff --git a/clang/test/CodeGenCXX/debug-info-windows-dtor.cpp b/clang/test/CodeGenCXX/debug-info-windows-dtor.cpp index 8233be70672..2f425fdd5be 100644 --- a/clang/test/CodeGenCXX/debug-info-windows-dtor.cpp +++ b/clang/test/CodeGenCXX/debug-info-windows-dtor.cpp @@ -18,5 +18,5 @@ template struct AB<int>; // CHECK: call {{.*}}@"\01??_G?$AB@H@@UAEPAXI@Z"({{.*}}) #{{[0-9]*}}, !dbg [[THUNK_LOC:![0-9]*]] // CHECK-LABEL: define -// CHECK: [[THUNK_VEC_DEL_DTOR:![0-9]*]] = !MDSubprogram({{.*}}function: {{.*}}@"\01??_E?$AB@H@@W3AEPAXI@Z" -// CHECK: [[THUNK_LOC]] = !MDLocation(line: 15, scope: [[THUNK_VEC_DEL_DTOR]]) +// CHECK: [[THUNK_VEC_DEL_DTOR:![0-9]*]] = !DISubprogram({{.*}}function: {{.*}}@"\01??_E?$AB@H@@W3AEPAXI@Z" +// CHECK: [[THUNK_LOC]] = !DILocation(line: 15, scope: [[THUNK_VEC_DEL_DTOR]]) diff --git a/clang/test/CodeGenCXX/debug-info-zero-length-arrays.cpp b/clang/test/CodeGenCXX/debug-info-zero-length-arrays.cpp index cc3206e8fdd..dc7558aa393 100644 --- a/clang/test/CodeGenCXX/debug-info-zero-length-arrays.cpp +++ b/clang/test/CodeGenCXX/debug-info-zero-length-arrays.cpp @@ -6,11 +6,11 @@ class A { }; A a; -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "x" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "x" // CHECK-SAME: baseType: [[ARRAY_TYPE:![0-9]+]] -// CHECK: [[ARRAY_TYPE]] = !MDCompositeType(tag: DW_TAG_array_type, +// CHECK: [[ARRAY_TYPE]] = !DICompositeType(tag: DW_TAG_array_type, // CHECK-NOT: size: // CHECK-SAME: align: 32 // CHECK-SAME: elements: [[ELEM_TYPE:![0-9]+]] // CHECK: [[ELEM_TYPE]] = !{[[SUBRANGE:.*]]} -// CHECK: [[SUBRANGE]] = !MDSubrange(count: -1) +// CHECK: [[SUBRANGE]] = !DISubrange(count: -1) diff --git a/clang/test/CodeGenCXX/debug-info.cpp b/clang/test/CodeGenCXX/debug-info.cpp index bcd78cb7144..13753684800 100644 --- a/clang/test/CodeGenCXX/debug-info.cpp +++ b/clang/test/CodeGenCXX/debug-info.cpp @@ -56,7 +56,7 @@ namespace VirtualBase { // CHECK: define void @_ZN7pr147634funcENS_3fooE // CHECK: call void @llvm.dbg.declare({{.*}}, metadata ![[F:.*]], metadata ![[EXPR:.*]]) -// MSVC: [[VBASE_B:![0-9]+]] = distinct !MDCompositeType(tag: DW_TAG_structure_type, name: "B",{{.*}} line: 49 +// MSVC: [[VBASE_B:![0-9]+]] = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "B",{{.*}} line: 49 // MSVC-SAME: size: 96, align: 32 // MSVC-NOT: offset: // MSVC-NOT: DIFlagFwdDecl @@ -64,10 +64,10 @@ namespace VirtualBase { // MSVC: [[VBASE_B_DEF]] = !{[[VBASE_A_IN_B:![0-9]+]], // // Look for the vbtable offset of A, which should be 4. -// MSVC: [[VBASE_A_IN_B]] = !MDDerivedType(tag: DW_TAG_inheritance, scope: [[VBASE_B]], +// MSVC: [[VBASE_A_IN_B]] = !DIDerivedType(tag: DW_TAG_inheritance, scope: [[VBASE_B]], // MSVC-SAME: baseType: !{{[0-9]*}} -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "B",{{.*}} line: 49, +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "B",{{.*}} line: 49, // CHECK-SAME: size: 128, align: 64, // CHECK-NOT: offset: // CHECK-NOT: DIFlagFwdDecl @@ -75,7 +75,7 @@ namespace VirtualBase { // CHECK: [[VBASE_B_DEF]] = !{[[VBASE_A_IN_B:![0-9]+]], // // Look for the vtable offset offset, which should be -24. -// CHECK: [[VBASE_A_IN_B]] = !MDDerivedType(tag: DW_TAG_inheritance +// CHECK: [[VBASE_A_IN_B]] = !DIDerivedType(tag: DW_TAG_inheritance // CHECK-SAME: scope: !"_ZTSN11VirtualBase1BE" // CHECK-SAME: baseType: !"_ZTSN11VirtualBase1AE" // CHECK-SAME: offset: 24, @@ -100,21 +100,21 @@ foo func(foo f) { return f; // reference 'f' for now because otherwise we hit another bug } -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "foo" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "foo" // CHECK-SAME: scope: [[PR14763:![0-9]+]] // CHECK-SAME: identifier: "[[FOO:.*]]" -// CHECK: [[PR14763]] = !MDNamespace(name: "pr14763" -// CHECK: [[INCTYPE:![0-9]*]] = !MDCompositeType(tag: DW_TAG_structure_type, name: "incomplete" +// CHECK: [[PR14763]] = !DINamespace(name: "pr14763" +// CHECK: [[INCTYPE:![0-9]*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "incomplete" // CHECK-SAME: DIFlagFwdDecl -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "a" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "a" // CHECK-SAME: elements: [[A_MEM:![0-9]+]] // CHECK-SAME: identifier: "_ZTSN7pr162141aE" // CHECK: [[A_MEM]] = !{[[A_I:![0-9]*]]} -// CHECK: [[A_I]] = !MDDerivedType(tag: DW_TAG_member, name: "i" -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "b" +// CHECK: [[A_I]] = !DIDerivedType(tag: DW_TAG_member, name: "i" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "b" // CHECK-SAME: DIFlagFwdDecl -// CHECK: [[FUNC:![0-9]+]] = !MDSubprogram(name: "func", linkageName: "_ZN7pr147634funcENS_3fooE" +// CHECK: [[FUNC:![0-9]+]] = !DISubprogram(name: "func", linkageName: "_ZN7pr147634funcENS_3fooE" // CHECK-SAME: type: [[FUNC_TYPE:![0-9]*]] // CHECK-SAME: isDefinition: true } @@ -124,16 +124,16 @@ void foo() { wchar_t d = c; } -// CHECK-NOT: !MDGlobalVariable(name: "c" +// CHECK-NOT: !DIGlobalVariable(name: "c" namespace pr9608 { // also pr9600 struct incomplete; incomplete (*x)[3]; -// CHECK: !MDGlobalVariable(name: "x", linkageName: "_ZN6pr96081xE" +// CHECK: !DIGlobalVariable(name: "x", linkageName: "_ZN6pr96081xE" // CHECK-SAME: type: [[INCARRAYPTR:![0-9]*]] // CHECK-SAME: variable: [3 x i8]** @_ZN6pr96081xE -// CHECK: [[INCARRAYPTR]] = !MDDerivedType(tag: DW_TAG_pointer_type, baseType: [[INCARRAY:![0-9]+]] -// CHECK: [[INCARRAY]] = !MDCompositeType(tag: DW_TAG_array_type +// CHECK: [[INCARRAYPTR]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: [[INCARRAY:![0-9]+]] +// CHECK: [[INCARRAY]] = !DICompositeType(tag: DW_TAG_array_type // CHECK-NOT: line: // CHECK-NOT: size: // CHECK-NOT: align: @@ -142,11 +142,11 @@ incomplete (*x)[3]; } // For some reason function arguments ended up down here -// CHECK: ![[F]] = !MDLocalVariable(tag: DW_TAG_arg_variable, name: "f", arg: 1, scope: [[FUNC]] +// CHECK: ![[F]] = !DILocalVariable(tag: DW_TAG_arg_variable, name: "f", arg: 1, scope: [[FUNC]] // CHECK-SAME: type: !"[[FOO]]" -// CHECK: ![[EXPR]] = !MDExpression(DW_OP_deref) +// CHECK: ![[EXPR]] = !DIExpression(DW_OP_deref) -// CHECK: !MDLocalVariable(tag: DW_TAG_auto_variable, name: "c" +// CHECK: !DILocalVariable(tag: DW_TAG_auto_variable, name: "c" namespace pr16214 { struct a { diff --git a/clang/test/CodeGenCXX/debug-lambda-expressions.cpp b/clang/test/CodeGenCXX/debug-lambda-expressions.cpp index 88951c72033..a53274af343 100644 --- a/clang/test/CodeGenCXX/debug-lambda-expressions.cpp +++ b/clang/test/CodeGenCXX/debug-lambda-expressions.cpp @@ -15,88 +15,88 @@ struct D { D(); D(const D&); int x; }; int d(int x) { D y[10]; return [x,y] { return y[x].x; }(); } // Randomness for file. -- 6 -// CHECK: [[FILE:.*]] = !MDFile(filename: "{{.*}}debug-lambda-expressions.cpp", +// CHECK: [[FILE:.*]] = !DIFile(filename: "{{.*}}debug-lambda-expressions.cpp", -// CHECK: ![[INT:[0-9]+]] = !MDBasicType(name: "int" +// CHECK: ![[INT:[0-9]+]] = !DIBasicType(name: "int" // A: 10 -// CHECK: ![[A_FUNC:.*]] = !MDSubprogram(name: "a"{{.*}}, line: [[A_LINE:[0-9]+]]{{.*}}, isDefinition: true +// CHECK: ![[A_FUNC:.*]] = !DISubprogram(name: "a"{{.*}}, line: [[A_LINE:[0-9]+]]{{.*}}, isDefinition: true // B: 14 -// CHECK: ![[B_FUNC:.*]] = !MDSubprogram(name: "b"{{.*}}, line: [[B_LINE:[0-9]+]]{{.*}}, isDefinition: true +// CHECK: ![[B_FUNC:.*]] = !DISubprogram(name: "b"{{.*}}, line: [[B_LINE:[0-9]+]]{{.*}}, isDefinition: true // C: 17 -// CHECK: ![[C_FUNC:.*]] = !MDSubprogram(name: "c"{{.*}}, line: [[C_LINE:[0-9]+]]{{.*}}, isDefinition: true +// CHECK: ![[C_FUNC:.*]] = !DISubprogram(name: "c"{{.*}}, line: [[C_LINE:[0-9]+]]{{.*}}, isDefinition: true // D: 18 -// CHECK: ![[D_FUNC:.*]] = !MDSubprogram(name: "d"{{.*}}, line: [[D_LINE:[0-9]+]]{{.*}}, isDefinition: true +// CHECK: ![[D_FUNC:.*]] = !DISubprogram(name: "d"{{.*}}, line: [[D_LINE:[0-9]+]]{{.*}}, isDefinition: true // Back to A. -- 78 -// CHECK: ![[LAM_A:.*]] = !MDCompositeType(tag: DW_TAG_class_type{{.*}}, scope: ![[A_FUNC]]{{.*}}, line: [[A_LINE]], +// CHECK: ![[LAM_A:.*]] = !DICompositeType(tag: DW_TAG_class_type{{.*}}, scope: ![[A_FUNC]]{{.*}}, line: [[A_LINE]], // CHECK-SAME: elements: ![[LAM_A_ARGS:[0-9]+]] // CHECK: ![[LAM_A_ARGS]] = !{![[CON_LAM_A:[0-9]+]]} -// CHECK: ![[CON_LAM_A]] = !MDSubprogram(name: "operator()" +// CHECK: ![[CON_LAM_A]] = !DISubprogram(name: "operator()" // CHECK-SAME: scope: ![[LAM_A]] // CHECK-SAME: line: [[A_LINE]] // CHECK-SAME: DIFlagPublic // Back to B. -- 67 -// CHECK: ![[LAM_B:.*]] = !MDCompositeType(tag: DW_TAG_class_type{{.*}}, scope: ![[B_FUNC]]{{.*}}, line: [[B_LINE]], +// CHECK: ![[LAM_B:.*]] = !DICompositeType(tag: DW_TAG_class_type{{.*}}, scope: ![[B_FUNC]]{{.*}}, line: [[B_LINE]], // CHECK-SAME: elements: ![[LAM_B_ARGS:[0-9]+]] // CHECK: ![[LAM_B_ARGS]] = !{![[CAP_B:[0-9]+]], ![[CON_LAM_B:[0-9]+]]} -// CHECK: ![[CAP_B]] = !MDDerivedType(tag: DW_TAG_member, name: "x" +// CHECK: ![[CAP_B]] = !DIDerivedType(tag: DW_TAG_member, name: "x" // CHECK-SAME: scope: ![[LAM_B]] // CHECK-SAME: line: [[B_LINE]], // CHECK-SAME: baseType: ![[INT]] -// CHECK: ![[CON_LAM_B]] = !MDSubprogram(name: "operator()" +// CHECK: ![[CON_LAM_B]] = !DISubprogram(name: "operator()" // CHECK-SAME: scope: ![[LAM_B]] // CHECK-SAME: line: [[B_LINE]] // CHECK-SAME: DIFlagPublic // Back to C. -- 55 -// CHECK: ![[LAM_C:.*]] = !MDCompositeType(tag: DW_TAG_class_type{{.*}}, scope: ![[C_FUNC]]{{.*}}, line: [[C_LINE]], +// CHECK: ![[LAM_C:.*]] = !DICompositeType(tag: DW_TAG_class_type{{.*}}, scope: ![[C_FUNC]]{{.*}}, line: [[C_LINE]], // CHECK-SAME: elements: ![[LAM_C_ARGS:[0-9]+]] // CHECK: ![[LAM_C_ARGS]] = !{![[CAP_C:[0-9]+]], ![[CON_LAM_C:[0-9]+]]} -// CHECK: ![[CAP_C]] = !MDDerivedType(tag: DW_TAG_member, name: "x" +// CHECK: ![[CAP_C]] = !DIDerivedType(tag: DW_TAG_member, name: "x" // CHECK-SAME: scope: ![[LAM_C]] // CHECK-SAME: line: [[C_LINE]], // CHECK-SAME: baseType: ![[TYPE_C_x:[0-9]+]] -// CHECK: ![[TYPE_C_x]] = !MDDerivedType(tag: DW_TAG_reference_type, baseType: ![[INT]] -// CHECK: ![[CON_LAM_C]] = !MDSubprogram(name: "operator()" +// CHECK: ![[TYPE_C_x]] = !DIDerivedType(tag: DW_TAG_reference_type, baseType: ![[INT]] +// CHECK: ![[CON_LAM_C]] = !DISubprogram(name: "operator()" // CHECK-SAME: scope: ![[LAM_C]] // CHECK-SAME: line: [[C_LINE]] // CHECK-SAME: DIFlagPublic // Back to D. -- 24 -// CHECK: ![[LAM_D:.*]] = !MDCompositeType(tag: DW_TAG_class_type{{.*}}, scope: ![[D_FUNC]]{{.*}}, line: [[D_LINE]], +// CHECK: ![[LAM_D:.*]] = !DICompositeType(tag: DW_TAG_class_type{{.*}}, scope: ![[D_FUNC]]{{.*}}, line: [[D_LINE]], // CHECK-SAME: elements: ![[LAM_D_ARGS:[0-9]+]] // CHECK: ![[LAM_D_ARGS]] = !{![[CAP_D_X:[0-9]+]], ![[CAP_D_Y:[0-9]+]], ![[CON_LAM_D:[0-9]+]]} -// CHECK: ![[CAP_D_X]] = !MDDerivedType(tag: DW_TAG_member, name: "x" +// CHECK: ![[CAP_D_X]] = !DIDerivedType(tag: DW_TAG_member, name: "x" // CHECK-SAME: scope: ![[LAM_D]] // CHECK-SAME: line: [[D_LINE]], -// CHECK: ![[CAP_D_Y]] = !MDDerivedType(tag: DW_TAG_member, name: "y" +// CHECK: ![[CAP_D_Y]] = !DIDerivedType(tag: DW_TAG_member, name: "y" // CHECK-SAME: scope: ![[LAM_D]] // CHECK-SAME: line: [[D_LINE]], -// CHECK: ![[CON_LAM_D]] = !MDSubprogram(name: "operator()" +// CHECK: ![[CON_LAM_D]] = !DISubprogram(name: "operator()" // CHECK-SAME: scope: ![[LAM_D]] // CHECK-SAME: line: [[D_LINE]] // CHECK-SAME: DIFlagPublic // CVAR: -// CHECK: !MDGlobalVariable(name: "cvar" +// CHECK: !DIGlobalVariable(name: "cvar" // CHECK-SAME: line: [[CVAR_LINE:[0-9]+]] // CHECK-SAME: type: ![[CVAR_T:[0-9]+]] -// CHECK: ![[CVAR_T]] = !MDCompositeType(tag: DW_TAG_class_type +// CHECK: ![[CVAR_T]] = !DICompositeType(tag: DW_TAG_class_type // CHECK-SAME: line: [[CVAR_LINE]], // CHECK-SAME: elements: ![[CVAR_ARGS:[0-9]+]] // CHECK: ![[CVAR_ARGS]] = !{!{{[0-9]+}}} // VAR: -// CHECK: !MDGlobalVariable(name: "var" +// CHECK: !DIGlobalVariable(name: "var" // CHECK-SAME: line: [[VAR_LINE:[0-9]+]] // CHECK-SAME: type: ![[VAR_T:[0-9]+]] -// CHECK: ![[VAR_T]] = !MDCompositeType(tag: DW_TAG_class_type +// CHECK: ![[VAR_T]] = !DICompositeType(tag: DW_TAG_class_type // CHECK-SAME: line: [[VAR_LINE]], // CHECK-SAME: elements: ![[VAR_ARGS:[0-9]+]] // CHECK: ![[VAR_ARGS]] = !{!{{[0-9]+}}} diff --git a/clang/test/CodeGenCXX/debug-lambda-this.cpp b/clang/test/CodeGenCXX/debug-lambda-this.cpp index 891470dcdba..e3ef6709170 100644 --- a/clang/test/CodeGenCXX/debug-lambda-this.cpp +++ b/clang/test/CodeGenCXX/debug-lambda-this.cpp @@ -12,10 +12,10 @@ int D::d(int x) { }(); } -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "this", +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "this", // CHECK-SAME: line: 11 // CHECK-SAME: baseType: ![[POINTER:[0-9]+]] // CHECK-SAME: size: 64, align: 64 // CHECK-NOT: offset: 0 // CHECK-SAME: ){{$}} -// CHECK: ![[POINTER]] = !MDDerivedType(tag: DW_TAG_pointer_type +// CHECK: ![[POINTER]] = !DIDerivedType(tag: DW_TAG_pointer_type diff --git a/clang/test/CodeGenCXX/destructor-debug-info.cpp b/clang/test/CodeGenCXX/destructor-debug-info.cpp index a8abfded2c2..2534364aa4c 100644 --- a/clang/test/CodeGenCXX/destructor-debug-info.cpp +++ b/clang/test/CodeGenCXX/destructor-debug-info.cpp @@ -19,4 +19,4 @@ void foo() { } } // Check there is a line number entry for line 19 where b1 is destructed. -// CHECK: !MDLocation(line: 19, +// CHECK: !DILocation(line: 19, diff --git a/clang/test/CodeGenCXX/field-access-debug-info.cpp b/clang/test/CodeGenCXX/field-access-debug-info.cpp index 23a27d325ce..38c06f16ade 100644 --- a/clang/test/CodeGenCXX/field-access-debug-info.cpp +++ b/clang/test/CodeGenCXX/field-access-debug-info.cpp @@ -1,10 +1,10 @@ // RUN: %clang -g -S -emit-llvm %s -o - | FileCheck %s -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "p" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "p" // CHECK-SAME: baseType: ![[INT:[0-9]+]] // CHECK-SAME: DIFlagPublic -// CHECK: ![[INT]] = !MDBasicType(name: "int" -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "pr" +// CHECK: ![[INT]] = !DIBasicType(name: "int" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "pr" // CHECK-NOT: flags: // CHECK-SAME: baseType: ![[INT]] diff --git a/clang/test/CodeGenCXX/globalinit-loc.cpp b/clang/test/CodeGenCXX/globalinit-loc.cpp index 69ff77ae91f..813a890ae5b 100644 --- a/clang/test/CodeGenCXX/globalinit-loc.cpp +++ b/clang/test/CodeGenCXX/globalinit-loc.cpp @@ -6,11 +6,11 @@ // // CHECK: define internal void @_GLOBAL__sub_I_globalinit_loc.cpp // CHECK: !dbg ![[DBG:.*]] -// CHECK: !MDSubprogram(linkageName: "_GLOBAL__sub_I_globalinit_loc.cpp" +// CHECK: !DISubprogram(linkageName: "_GLOBAL__sub_I_globalinit_loc.cpp" // CHECK-NOT: line: // CHECK-SAME: isLocal: true // CHECK-SAME: isDefinition: true -// CHECK: ![[DBG]] = !MDLocation(line: 0, +// CHECK: ![[DBG]] = !DILocation(line: 0, # 99 "someheader.h" class A { public: diff --git a/clang/test/CodeGenCXX/inline-dllexport-member.cpp b/clang/test/CodeGenCXX/inline-dllexport-member.cpp index db8216b4996..af9a5360674 100644 --- a/clang/test/CodeGenCXX/inline-dllexport-member.cpp +++ b/clang/test/CodeGenCXX/inline-dllexport-member.cpp @@ -5,7 +5,7 @@ struct __declspec(dllexport) s { static const unsigned int ui = 0; }; -// CHECK: ![[SCOPE:[0-9]+]] = !MDCompileUnit( -// CHECK: !MDGlobalVariable(name: "ui", linkageName: "_ZN1s2uiE", scope: ![[SCOPE]], +// CHECK: ![[SCOPE:[0-9]+]] = !DICompileUnit( +// CHECK: !DIGlobalVariable(name: "ui", linkageName: "_ZN1s2uiE", scope: ![[SCOPE]], // CHECK-SAME: variable: i32* @_ZN1s2uiE diff --git a/clang/test/CodeGenCXX/linetable-cleanup.cpp b/clang/test/CodeGenCXX/linetable-cleanup.cpp index 67ceecb04ae..99aa814a933 100644 --- a/clang/test/CodeGenCXX/linetable-cleanup.cpp +++ b/clang/test/CodeGenCXX/linetable-cleanup.cpp @@ -25,13 +25,13 @@ int foo() c.i = 42; return 0; // This breakpoint should be at/before the cleanup code. - // CHECK: ![[RET]] = !MDLocation(line: [[@LINE+1]], scope: !{{.*}}) + // CHECK: ![[RET]] = !DILocation(line: [[@LINE+1]], scope: !{{.*}}) } void bar() { if (!foo()) - // CHECK: {{.*}} = !MDLocation(line: [[@LINE+1]], scope: !{{.*}}) + // CHECK: {{.*}} = !DILocation(line: [[@LINE+1]], scope: !{{.*}}) return; if (foo()) { @@ -39,21 +39,21 @@ void bar() c.i = foo(); } // Clang creates only a single ret instruction. Make sure it is at a useful line. - // CHECK: ![[RETBAR]] = !MDLocation(line: [[@LINE+1]], scope: !{{.*}}) + // CHECK: ![[RETBAR]] = !DILocation(line: [[@LINE+1]], scope: !{{.*}}) } void baz() { if (!foo()) - // CHECK: ![[SCOPE1:.*]] = distinct !MDLexicalBlock({{.*}}, line: [[@LINE-1]]) - // CHECK: {{.*}} = !MDLocation(line: [[@LINE+1]], scope: ![[SCOPE1]]) + // CHECK: ![[SCOPE1:.*]] = distinct !DILexicalBlock({{.*}}, line: [[@LINE-1]]) + // CHECK: {{.*}} = !DILocation(line: [[@LINE+1]], scope: ![[SCOPE1]]) return; if (foo()) { // no cleanup - // CHECK: {{.*}} = !MDLocation(line: [[@LINE+2]], scope: ![[SCOPE2:.*]]) - // CHECK: ![[SCOPE2]] = distinct !MDLexicalBlock({{.*}}, line: [[@LINE-3]]) + // CHECK: {{.*}} = !DILocation(line: [[@LINE+2]], scope: ![[SCOPE2:.*]]) + // CHECK: ![[SCOPE2]] = distinct !DILexicalBlock({{.*}}, line: [[@LINE-3]]) return; } - // CHECK: ![[RETBAZ]] = !MDLocation(line: [[@LINE+1]], scope: !{{.*}}) + // CHECK: ![[RETBAZ]] = !DILocation(line: [[@LINE+1]], scope: !{{.*}}) } diff --git a/clang/test/CodeGenCXX/linetable-eh.cpp b/clang/test/CodeGenCXX/linetable-eh.cpp index 036cfecffe4..219aab1bf54 100644 --- a/clang/test/CodeGenCXX/linetable-eh.cpp +++ b/clang/test/CodeGenCXX/linetable-eh.cpp @@ -12,10 +12,10 @@ // CHECK-NEXT: cleanup, !dbg ![[DBG3:.*]] // CHECK-DAG: ![[CURRENT_ADDR]] = {{.*}}name: "current_address" // CHECK-DAG: ![[FOUND_IT]] = {{.*}}name: "found_it" -// CHECK-DAG: ![[DBG1]] = !MDLocation(line: 256, -// CHECK-DAG: ![[DBG2]] = !MDLocation(line: 257, -// CHECK-DAG: ![[DBG3]] = !MDLocation(line: 268, -// CHECK-DAG: ![[DBG4]] = !MDLocation(line: 256, +// CHECK-DAG: ![[DBG1]] = !DILocation(line: 256, +// CHECK-DAG: ![[DBG2]] = !DILocation(line: 257, +// CHECK-DAG: ![[DBG3]] = !DILocation(line: 268, +// CHECK-DAG: ![[DBG4]] = !DILocation(line: 256, typedef unsigned long long uint64_t; template<class _Tp> class shared_ptr { public: diff --git a/clang/test/CodeGenCXX/linetable-fnbegin.cpp b/clang/test/CodeGenCXX/linetable-fnbegin.cpp index f579de13d53..1f752ff0b4e 100644 --- a/clang/test/CodeGenCXX/linetable-fnbegin.cpp +++ b/clang/test/CodeGenCXX/linetable-fnbegin.cpp @@ -4,12 +4,12 @@ // CHECK: define{{.*}}bar // CHECK-NOT: define // CHECK: ret {{.*}}, !dbg [[DBG:.*]] -// CHECK: [[HPP:.*]] = !MDFile(filename: "./template.hpp", -// CHECK: [[SP:.*]] = !MDSubprogram(name: "bar", +// CHECK: [[HPP:.*]] = !DIFile(filename: "./template.hpp", +// CHECK: [[SP:.*]] = !DISubprogram(name: "bar", // CHECK-SAME: file: [[HPP]], line: 22 // CHECK-SAME: isDefinition: true // We shouldn't need a lexical block for this function. -// CHECK: [[DBG]] = !MDLocation(line: 23, scope: [[SP]]) +// CHECK: [[DBG]] = !DILocation(line: 23, scope: [[SP]]) # 1 "./template.h" 1 diff --git a/clang/test/CodeGenCXX/linetable-virtual-variadic.cpp b/clang/test/CodeGenCXX/linetable-virtual-variadic.cpp index 0838dd586a7..c16c5e354b5 100644 --- a/clang/test/CodeGenCXX/linetable-virtual-variadic.cpp +++ b/clang/test/CodeGenCXX/linetable-virtual-variadic.cpp @@ -17,7 +17,7 @@ void Derived::VariadicFunction(...) { } // // CHECK: !llvm.dbg.cu = !{![[CU:[0-9]+]]} // -// CHECK: ![[CU]] = !MDCompileUnit({{.*}} subprograms: ![[SPs:[0-9]+]] +// CHECK: ![[CU]] = !DICompileUnit({{.*}} subprograms: ![[SPs:[0-9]+]] // CHECK: ![[SPs]] = !{![[SP:[0-9]+]]} -// CHECK: ![[SP]] = !MDSubprogram(name: "VariadicFunction",{{.*}} function: {{[^:]+}} @_ZN7Derived16VariadicFunctionEz -// CHECK: ![[LOC]] = !MDLocation({{.*}}scope: ![[SP]]) +// CHECK: ![[SP]] = !DISubprogram(name: "VariadicFunction",{{.*}} function: {{[^:]+}} @_ZN7Derived16VariadicFunctionEz +// CHECK: ![[LOC]] = !DILocation({{.*}}scope: ![[SP]]) diff --git a/clang/test/CodeGenCXX/lpad-linetable.cpp b/clang/test/CodeGenCXX/lpad-linetable.cpp index c81191b9fed..7f1d2214d8f 100644 --- a/clang/test/CodeGenCXX/lpad-linetable.cpp +++ b/clang/test/CodeGenCXX/lpad-linetable.cpp @@ -4,7 +4,7 @@ // CHECK: ret i32 // CHECK: landingpad {{.*}} // CHECK-NEXT: !dbg ![[LPAD:[0-9]+]] -// CHECK: ![[LPAD]] = !MDLocation(line: 24, scope: !{{.*}}) +// CHECK: ![[LPAD]] = !DILocation(line: 24, scope: !{{.*}}) # 1 "/usr/include/c++/4.2.1/vector" 1 3 typedef long unsigned int __darwin_size_t; diff --git a/clang/test/CodeGenCXX/scoped-enums-debug-info.cpp b/clang/test/CodeGenCXX/scoped-enums-debug-info.cpp index 18f427802b7..52658fc28d7 100644 --- a/clang/test/CodeGenCXX/scoped-enums-debug-info.cpp +++ b/clang/test/CodeGenCXX/scoped-enums-debug-info.cpp @@ -1,9 +1,9 @@ // RUN: %clang_cc1 -std=c++11 -emit-llvm -g -o - %s | FileCheck %s // Test that we are emitting debug info and base types for scoped enums. -// CHECK: !MDCompositeType(tag: DW_TAG_enumeration_type, name: "Color" +// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "Color" // CHECK-SAME: baseType: ![[INT:[0-9]+]] -// CHECK: ![[INT]] = !MDBasicType(name: "int" +// CHECK: ![[INT]] = !DIBasicType(name: "int" enum class Color { gray }; void f(Color); @@ -11,7 +11,7 @@ void g() { f(Color::gray); } -// CHECK: !MDCompositeType(tag: DW_TAG_enumeration_type, name: "Colour" +// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "Colour" // CHECK-SAME: baseType: ![[INT]] enum struct Colour { grey }; @@ -20,9 +20,9 @@ void i() { h(Colour::grey); } -// CHECK: !MDCompositeType(tag: DW_TAG_enumeration_type, name: "Couleur" +// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "Couleur" // CHECK-SAME: baseType: ![[UCHAR:[0-9]+]] -// CHECK: ![[UCHAR]] = !MDBasicType(name: "unsigned char" +// CHECK: ![[UCHAR]] = !DIBasicType(name: "unsigned char" enum class Couleur : unsigned char { gris }; void j(Couleur); diff --git a/clang/test/CodeGenCXX/vtable-holder-self-reference.cpp b/clang/test/CodeGenCXX/vtable-holder-self-reference.cpp index 83d081b1887..8f5314e7211 100644 --- a/clang/test/CodeGenCXX/vtable-holder-self-reference.cpp +++ b/clang/test/CodeGenCXX/vtable-holder-self-reference.cpp @@ -4,7 +4,7 @@ // rid of self-referenceing structure_types (PR21902), then it should be safe // to just kill this test. // -// CHECK: ![[SELF:[0-9]+]] = distinct !MDCompositeType(tag: DW_TAG_structure_type, name: "B", +// CHECK: ![[SELF:[0-9]+]] = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "B", // CHECK-SAME: vtableHolder: ![[SELF]] void foo() { diff --git a/clang/test/CodeGenObjC/2010-02-09-DbgSelf.m b/clang/test/CodeGenObjC/2010-02-09-DbgSelf.m index 695a964a69d..a0179d9227a 100644 --- a/clang/test/CodeGenObjC/2010-02-09-DbgSelf.m +++ b/clang/test/CodeGenObjC/2010-02-09-DbgSelf.m @@ -1,7 +1,7 @@ // RUN: %clang_cc1 -x objective-c -emit-llvm -g < %s | FileCheck %s // Test to check that "self" argument is assigned a location. // CHECK: call void @llvm.dbg.declare(metadata %0** %{{[^,]+}}, metadata [[SELF:![0-9]*]], metadata !{{.*}}) -// CHECK: [[SELF]] = !MDLocalVariable(tag: DW_TAG_arg_variable, name: "self" +// CHECK: [[SELF]] = !DILocalVariable(tag: DW_TAG_arg_variable, name: "self" @interface Foo -(void) Bar: (int)x ; diff --git a/clang/test/CodeGenObjC/2010-02-15-Dbg-MethodStart.m b/clang/test/CodeGenObjC/2010-02-15-Dbg-MethodStart.m index 7cac8f1c7d7..1a5df30dd84 100644 --- a/clang/test/CodeGenObjC/2010-02-15-Dbg-MethodStart.m +++ b/clang/test/CodeGenObjC/2010-02-15-Dbg-MethodStart.m @@ -7,7 +7,7 @@ @implementation Foo -(int) barMethod { - // CHECK: !MDSubprogram({{.*}}line: [[@LINE-1]] + // CHECK: !DISubprogram({{.*}}line: [[@LINE-1]] int i = 0; int j = 1; int k = 1; diff --git a/clang/test/CodeGenObjC/arc-linetable-autorelease.m b/clang/test/CodeGenObjC/arc-linetable-autorelease.m index ab20f3e9baf..329206867b8 100644 --- a/clang/test/CodeGenObjC/arc-linetable-autorelease.m +++ b/clang/test/CodeGenObjC/arc-linetable-autorelease.m @@ -32,8 +32,8 @@ NSRect NSMakeRect(CGFloat x, CGFloat y, CGFloat w, CGFloat h); // CHECK: call void @objc_storeStrong{{.*}} !dbg ![[ARC:[0-9]+]] // CHECK: call {{.*}} @objc_autoreleaseReturnValue{{.*}} !dbg ![[ARC]] // CHECK: ret {{.*}} !dbg ![[ARC]] - // CHECK: ![[RET]] = !MDLocation(line: [[@LINE+1]], scope: !{{.*}}) + // CHECK: ![[RET]] = !DILocation(line: [[@LINE+1]], scope: !{{.*}}) return path; - // CHECK: ![[ARC]] = !MDLocation(line: [[@LINE+1]], scope: !{{.*}}) + // CHECK: ![[ARC]] = !DILocation(line: [[@LINE+1]], scope: !{{.*}}) } @end diff --git a/clang/test/CodeGenObjC/arc-linetable.m b/clang/test/CodeGenObjC/arc-linetable.m index 5a9eda992ee..a3232ecd4e0 100644 --- a/clang/test/CodeGenObjC/arc-linetable.m +++ b/clang/test/CodeGenObjC/arc-linetable.m @@ -54,55 +54,55 @@ typedef signed char BOOL; @implementation AppDelegate : NSObject -// CHECK: ![[TESTNOSIDEEFFECT:.*]] = !MDSubprogram(name: "-[AppDelegate testNoSideEffect:]" +// CHECK: ![[TESTNOSIDEEFFECT:.*]] = !DISubprogram(name: "-[AppDelegate testNoSideEffect:]" // CHECK-SAME: line: [[@LINE+2]] // CHECK-SAME: isLocal: true, isDefinition: true - (int)testNoSideEffect:(NSString *)foo { int x = 1; return 1; // Return expression - // CHECK: ![[RET1]] = !MDLocation(line: [[@LINE+1]], scope: ![[TESTNOSIDEEFFECT]]) + // CHECK: ![[RET1]] = !DILocation(line: [[@LINE+1]], scope: ![[TESTNOSIDEEFFECT]]) } // Cleanup + Ret - (int)testNoCleanup { - // CHECK: ![[RET2]] = !MDLocation(line: [[@LINE+1]], scope: !{{.*}}) + // CHECK: ![[RET2]] = !DILocation(line: [[@LINE+1]], scope: !{{.*}}) return 1; } - (int)testSideEffect:(NSString *)foo { - // CHECK: ![[MSG3]] = !MDLocation(line: [[@LINE+1]], scope: !{{.*}}) + // CHECK: ![[MSG3]] = !DILocation(line: [[@LINE+1]], scope: !{{.*}}) return [self testNoSideEffect :foo]; - // CHECK: ![[RET3]] = !MDLocation(line: [[@LINE+1]], scope: !{{.*}}) + // CHECK: ![[RET3]] = !DILocation(line: [[@LINE+1]], scope: !{{.*}}) } - (int)testMultiline:(NSString *)foo { - // CHECK: ![[MSG4]] = !MDLocation(line: [[@LINE+1]], scope: !{{.*}}) + // CHECK: ![[MSG4]] = !DILocation(line: [[@LINE+1]], scope: !{{.*}}) int r = [self testSideEffect :foo]; - // CHECK: ![[EXP4]] = !MDLocation(line: [[@LINE+1]], scope: !{{.*}}) + // CHECK: ![[EXP4]] = !DILocation(line: [[@LINE+1]], scope: !{{.*}}) return r; - // CHECK: ![[RET4]] = !MDLocation(line: [[@LINE+1]], scope: !{{.*}}) + // CHECK: ![[RET4]] = !DILocation(line: [[@LINE+1]], scope: !{{.*}}) } - (void)testVoid:(NSString *)foo { return; - // CHECK: ![[RET5]] = !MDLocation(line: [[@LINE+1]], scope: !{{.*}}) + // CHECK: ![[RET5]] = !DILocation(line: [[@LINE+1]], scope: !{{.*}}) } - (void)testVoidNoReturn:(NSString *)foo { - // CHECK: ![[MSG6]] = !MDLocation(line: [[@LINE+1]], scope: !{{.*}}) + // CHECK: ![[MSG6]] = !DILocation(line: [[@LINE+1]], scope: !{{.*}}) [self testVoid :foo]; - // CHECK: ![[RET6]] = !MDLocation(line: [[@LINE+1]], scope: !{{.*}}) + // CHECK: ![[RET6]] = !DILocation(line: [[@LINE+1]], scope: !{{.*}}) } - (int)testNoCleanupSideEffect { - // CHECK: ![[MSG7]] = !MDLocation(line: [[@LINE+1]], scope: !{{.*}}) + // CHECK: ![[MSG7]] = !DILocation(line: [[@LINE+1]], scope: !{{.*}}) [self testVoid :@"foo"]; - // CHECK: ![[RET7]] = !MDLocation(line: [[@LINE+1]], scope: !{{.*}}) + // CHECK: ![[RET7]] = !DILocation(line: [[@LINE+1]], scope: !{{.*}}) return 1; } - (void)testCleanupVoid:(BOOL)skip withDelegate: (AppDelegate *) delegate { static BOOL skip_all; - // CHECK: ![[SKIP1]] = !MDLocation(line: [[@LINE+1]], scope: + // CHECK: ![[SKIP1]] = !DILocation(line: [[@LINE+1]], scope: if (!skip_all) { if (!skip) { return; @@ -112,8 +112,8 @@ typedef signed char BOOL; [delegate testVoid :s]; } } - // CHECK: ![[RET8]] = !MDLocation(line: [[@LINE+2]], scope: - // CHECK: ![[ARC8]] = !MDLocation(line: [[@LINE+1]], scope: + // CHECK: ![[RET8]] = !DILocation(line: [[@LINE+2]], scope: + // CHECK: ![[ARC8]] = !DILocation(line: [[@LINE+1]], scope: } diff --git a/clang/test/CodeGenObjC/block-byref-debuginfo.m b/clang/test/CodeGenObjC/block-byref-debuginfo.m index dc8379bf852..aa916289449 100644 --- a/clang/test/CodeGenObjC/block-byref-debuginfo.m +++ b/clang/test/CodeGenObjC/block-byref-debuginfo.m @@ -3,7 +3,7 @@ // rdar://problem/14386148 // Test that the foo is aligned at an 8 byte boundary in the DWARF // expression (256) that locates it inside of the byref descriptor: -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "foo", +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "foo", // CHECK-NOT: line: // CHECK-SAME: align: 64 // CHECK-SAME: offset: 256 diff --git a/clang/test/CodeGenObjC/catch-lexical-block.m b/clang/test/CodeGenObjC/catch-lexical-block.m index 5ff184a91de..ae49405160d 100644 --- a/clang/test/CodeGenObjC/catch-lexical-block.m +++ b/clang/test/CodeGenObjC/catch-lexical-block.m @@ -9,7 +9,7 @@ void f0() { // We should have 3 lexical blocks here at the moment, including one // for the catch block. -// CHECK: !MDLexicalBlock( -// CHECK: !MDLocalVariable(tag: DW_TAG_auto_variable -// CHECK: !MDLexicalBlock( -// CHECK: !MDLexicalBlock( +// CHECK: !DILexicalBlock( +// CHECK: !DILocalVariable(tag: DW_TAG_auto_variable +// CHECK: !DILexicalBlock( +// CHECK: !DILexicalBlock( diff --git a/clang/test/CodeGenObjC/debug-info-block-captured-self.m b/clang/test/CodeGenObjC/debug-info-block-captured-self.m index ccddbef5cef..fb9d7c2045e 100644 --- a/clang/test/CodeGenObjC/debug-info-block-captured-self.m +++ b/clang/test/CodeGenObjC/debug-info-block-captured-self.m @@ -63,9 +63,9 @@ typedef enum { // make sure we are still in the same function // CHECK: define {{.*}}__copy_helper_block_ // Metadata -// CHECK: ![[MAIN:.*]] = !MDCompositeType(tag: DW_TAG_structure_type, name: "Main" +// CHECK: ![[MAIN:.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Main" // CHECK-SAME: line: 23, -// CHECK: ![[PMAIN:.*]] = !MDDerivedType(tag: DW_TAG_pointer_type, baseType: ![[MAIN]], -// CHECK: ![[BDMD]] = !MDLocalVariable(tag: DW_TAG_arg_variable, name: ".block_descriptor" -// CHECK: ![[SELF]] = !MDLocalVariable(tag: DW_TAG_auto_variable, name: "self" +// CHECK: ![[PMAIN:.*]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: ![[MAIN]], +// CHECK: ![[BDMD]] = !DILocalVariable(tag: DW_TAG_arg_variable, name: ".block_descriptor" +// CHECK: ![[SELF]] = !DILocalVariable(tag: DW_TAG_auto_variable, name: "self" // CHECK-SAME: line: 40, diff --git a/clang/test/CodeGenObjC/debug-info-block-helper.m b/clang/test/CodeGenObjC/debug-info-block-helper.m index dc57c689779..ea68cb1cf38 100644 --- a/clang/test/CodeGenObjC/debug-info-block-helper.m +++ b/clang/test/CodeGenObjC/debug-info-block-helper.m @@ -2,7 +2,7 @@ // RUN: %clang_cc1 -emit-llvm -fblocks -g -triple x86_64-apple-darwin10 -fobjc-runtime=macosx-fragile-10.5 %s -o - | FileCheck %s extern void foo(void(^)(void)); -// CHECK: !MDSubprogram(name: "__destroy_helper_block_" +// CHECK: !DISubprogram(name: "__destroy_helper_block_" @interface NSObject { struct objc_object *isa; diff --git a/clang/test/CodeGenObjC/debug-info-block-type.m b/clang/test/CodeGenObjC/debug-info-block-type.m index 018c4c6e2e1..35c92dc64bd 100644 --- a/clang/test/CodeGenObjC/debug-info-block-type.m +++ b/clang/test/CodeGenObjC/debug-info-block-type.m @@ -1,22 +1,22 @@ // RUN: %clang_cc1 -emit-llvm -fblocks -g -triple x86_64-apple-darwin14 -x objective-c < %s -o - | FileCheck %s #define nil ((void*) 0) typedef signed char BOOL; -// CHECK: ![[BOOL:[0-9]+]] = !MDDerivedType(tag: DW_TAG_typedef, name: "BOOL" +// CHECK: ![[BOOL:[0-9]+]] = !DIDerivedType(tag: DW_TAG_typedef, name: "BOOL" // CHECK-SAME: line: [[@LINE-2]] -// CHECK: ![[ID:[0-9]+]] = !MDDerivedType(tag: DW_TAG_typedef, name: "id" +// CHECK: ![[ID:[0-9]+]] = !DIDerivedType(tag: DW_TAG_typedef, name: "id" typedef BOOL (^SomeKindOfPredicate)(id obj); -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "__FuncPtr" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "__FuncPtr" // CHECK-SAME: baseType: ![[PTR:[0-9]+]] -// CHECK: ![[PTR]] = !MDDerivedType(tag: DW_TAG_pointer_type, +// CHECK: ![[PTR]] = !DIDerivedType(tag: DW_TAG_pointer_type, // CHECK-SAME: baseType: ![[FNTYPE:[0-9]+]] -// CHECK: ![[FNTYPE]] = !MDSubroutineType(types: ![[ARGS:[0-9]+]]) +// CHECK: ![[FNTYPE]] = !DISubroutineType(types: ![[ARGS:[0-9]+]]) // CHECK: ![[ARGS]] = !{![[BOOL]], ![[ID]]} int main() { SomeKindOfPredicate p = ^BOOL(id obj) { return obj != nil; }; - // CHECK: !MDDerivedType(tag: DW_TAG_member, name: "__FuncPtr", + // CHECK: !DIDerivedType(tag: DW_TAG_member, name: "__FuncPtr", // CHECK-SAME: line: [[@LINE-2]] // CHECK-SAME: size: 64, align: 64, offset: 128, return p(nil); diff --git a/clang/test/CodeGenObjC/debug-info-blocks.m b/clang/test/CodeGenObjC/debug-info-blocks.m index 7e425f8b0a7..5514c5164c9 100644 --- a/clang/test/CodeGenObjC/debug-info-blocks.m +++ b/clang/test/CodeGenObjC/debug-info-blocks.m @@ -22,11 +22,11 @@ // CHECK-NOT: ret // CHECK: load {{.*}}, !dbg ![[DESTROY_LINE:[0-9]+]] -// CHECK-DAG: [[DBG_LINE]] = !MDLocation(line: 0, scope: ![[COPY_SP:[0-9]+]]) -// CHECK-DAG: [[COPY_LINE]] = !MDLocation(line: 0, scope: ![[COPY_SP:[0-9]+]]) -// CHECK-DAG: [[COPY_SP]] = !MDSubprogram(name: "__copy_helper_block_" -// CHECK-DAG: [[DESTROY_LINE]] = !MDLocation(line: 0, scope: ![[DESTROY_SP:[0-9]+]]) -// CHECK-DAG: [[DESTROY_SP]] = !MDSubprogram(name: "__destroy_helper_block_" +// CHECK-DAG: [[DBG_LINE]] = !DILocation(line: 0, scope: ![[COPY_SP:[0-9]+]]) +// CHECK-DAG: [[COPY_LINE]] = !DILocation(line: 0, scope: ![[COPY_SP:[0-9]+]]) +// CHECK-DAG: [[COPY_SP]] = !DISubprogram(name: "__copy_helper_block_" +// CHECK-DAG: [[DESTROY_LINE]] = !DILocation(line: 0, scope: ![[DESTROY_SP:[0-9]+]]) +// CHECK-DAG: [[DESTROY_SP]] = !DISubprogram(name: "__destroy_helper_block_" typedef unsigned int NSUInteger; @protocol NSObject @@ -61,8 +61,8 @@ static void run(void (^block)(void)) { if ((self = [super init])) { run(^{ - // CHECK-DAG: ![[SELF]] = !MDLocalVariable(tag: DW_TAG_auto_variable, name: "self"{{.*}}, line: [[@LINE+4]], - // CHECK-DAG: ![[D]] = !MDLocalVariable(tag: DW_TAG_auto_variable, name: "d"{{.*}}, line: [[@LINE+1]], + // CHECK-DAG: ![[SELF]] = !DILocalVariable(tag: DW_TAG_auto_variable, name: "self"{{.*}}, line: [[@LINE+4]], + // CHECK-DAG: ![[D]] = !DILocalVariable(tag: DW_TAG_auto_variable, name: "d"{{.*}}, line: [[@LINE+1]], NSMutableDictionary *d = [[NSMutableDictionary alloc] init]; ivar = 42 + (int)[d count]; }); diff --git a/clang/test/CodeGenObjC/debug-info-fwddecl.m b/clang/test/CodeGenObjC/debug-info-fwddecl.m index 8291d47b09b..8f419de9bfd 100644 --- a/clang/test/CodeGenObjC/debug-info-fwddecl.m +++ b/clang/test/CodeGenObjC/debug-info-fwddecl.m @@ -2,7 +2,7 @@ @class ForwardObjcClass; ForwardObjcClass *ptr = 0; -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "ForwardObjcClass" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "ForwardObjcClass" // CHECK-SAME: line: 2 // CHECK-NOT: size: // CHECK-NOT: align: diff --git a/clang/test/CodeGenObjC/debug-info-getter-name.m b/clang/test/CodeGenObjC/debug-info-getter-name.m index 5fd022e07af..1d7f545f34b 100644 --- a/clang/test/CodeGenObjC/debug-info-getter-name.m +++ b/clang/test/CodeGenObjC/debug-info-getter-name.m @@ -1,7 +1,7 @@ // REQUIRES: x86-registered-target // RUN: %clang_cc1 -emit-llvm -triple x86_64-apple-darwin10 -fexceptions -fobjc-exceptions -g %s -o - | FileCheck %s -// CHECK: !MDSubprogram(name: "-[InstanceVariablesEverywhereButTheInterface someString]" +// CHECK: !DISubprogram(name: "-[InstanceVariablesEverywhereButTheInterface someString]" //rdar: //8498026 diff --git a/clang/test/CodeGenObjC/debug-info-id-with-protocol.m b/clang/test/CodeGenObjC/debug-info-id-with-protocol.m index c3b88d77623..836e456b235 100644 --- a/clang/test/CodeGenObjC/debug-info-id-with-protocol.m +++ b/clang/test/CodeGenObjC/debug-info-id-with-protocol.m @@ -36,12 +36,12 @@ int main() } } // Verify that the debug type for both variables is 'id'. -// CHECK: ![[IDTYPE:[0-9]+]] = !MDDerivedType(tag: DW_TAG_typedef, name: "id" +// CHECK: ![[IDTYPE:[0-9]+]] = !DIDerivedType(tag: DW_TAG_typedef, name: "id" // -// CHECK: !MDLocalVariable(tag: DW_TAG_arg_variable, name: "bad_carrier" +// CHECK: !DILocalVariable(tag: DW_TAG_arg_variable, name: "bad_carrier" // CHECK-NOT: line: // CHECK-SAME: type: ![[IDTYPE]] // -// CHECK: !MDLocalVariable(tag: DW_TAG_arg_variable, name: "good_carrier" +// CHECK: !DILocalVariable(tag: DW_TAG_arg_variable, name: "good_carrier" // CHECK-NOT: line: // CHECK-SAME: type: ![[IDTYPE]] diff --git a/clang/test/CodeGenObjC/debug-info-impl.m b/clang/test/CodeGenObjC/debug-info-impl.m index 4e56988d61c..556bf0ee63f 100644 --- a/clang/test/CodeGenObjC/debug-info-impl.m +++ b/clang/test/CodeGenObjC/debug-info-impl.m @@ -7,7 +7,7 @@ @interface Shape : NSObject @end -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "Circle" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "Circle" // CHECK-SAME: line: [[@LINE+1]], @interface Circle : Shape diff --git a/clang/test/CodeGenObjC/debug-info-instancetype.m b/clang/test/CodeGenObjC/debug-info-instancetype.m index a0553671887..c96153edb9d 100644 --- a/clang/test/CodeGenObjC/debug-info-instancetype.m +++ b/clang/test/CodeGenObjC/debug-info-instancetype.m @@ -13,13 +13,13 @@ @implementation Foo +(instancetype)defaultFoo {return 0;} -// CHECK: ![[FOO:[0-9]+]] = !MDCompositeType(tag: DW_TAG_structure_type, name: "Foo" -// CHECK: !MDSubprogram(name: "+[Foo defaultFoo]" +// CHECK: ![[FOO:[0-9]+]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Foo" +// CHECK: !DISubprogram(name: "+[Foo defaultFoo]" // CHECK-SAME: line: [[@LINE-3]] // CHECK-SAME: type: ![[TYPE:[0-9]+]] -// CHECK: ![[TYPE]] = !MDSubroutineType(types: ![[RESULT:[0-9]+]]) +// CHECK: ![[TYPE]] = !DISubroutineType(types: ![[RESULT:[0-9]+]]) // CHECK: ![[RESULT]] = !{![[FOOPTR:[0-9]+]], -// CHECK: ![[FOOPTR]] = !MDDerivedType(tag: DW_TAG_pointer_type +// CHECK: ![[FOOPTR]] = !DIDerivedType(tag: DW_TAG_pointer_type // CHECK-SAME: baseType: ![[FOO]] @end diff --git a/clang/test/CodeGenObjC/debug-info-ivars-extension.m b/clang/test/CodeGenObjC/debug-info-ivars-extension.m index 187a6df219e..fe658f009f1 100644 --- a/clang/test/CodeGenObjC/debug-info-ivars-extension.m +++ b/clang/test/CodeGenObjC/debug-info-ivars-extension.m @@ -24,22 +24,22 @@ void gorf (I* pg) { int _b = pg->b; } -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "I" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "I" // Check for "a". -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "a" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "a" // CHECK-SAME: line: 7 // CHECK-SAME: baseType: ![[INT:[0-9]+]] // CHECK-SAME: size: 32, align: 32 // CHECK-NOT: offset: // CHECK-SAME: flags: DIFlagPublic -// CHECK: ![[INT]] = !MDBasicType(name: "int" +// CHECK: ![[INT]] = !DIBasicType(name: "int" // Make sure we don't output the same type twice. -// CHECK-NOT: !MDCompositeType(tag: DW_TAG_structure_type, name: "I" +// CHECK-NOT: !DICompositeType(tag: DW_TAG_structure_type, name: "I" // Check for "b". -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "b" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "b" // CHECK-SAME: line: 18 // CHECK-SAME: baseType: ![[INT]] // CHECK-SAME: size: 32, align: 32 diff --git a/clang/test/CodeGenObjC/debug-info-ivars-indirect.m b/clang/test/CodeGenObjC/debug-info-ivars-indirect.m index 0ef350ab2e8..0c644c7fe34 100644 --- a/clang/test/CodeGenObjC/debug-info-ivars-indirect.m +++ b/clang/test/CodeGenObjC/debug-info-ivars-indirect.m @@ -6,10 +6,10 @@ // This happens to be the order the members are emitted in... I'm assuming it's // not meaningful/important, so if something causes the order to change, feel // free to update the test to reflect the new order. -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "a" -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "d" -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "c" -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "b" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "a" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "d" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "c" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "b" @interface I { diff --git a/clang/test/CodeGenObjC/debug-info-ivars-private.m b/clang/test/CodeGenObjC/debug-info-ivars-private.m index 7fec4b5a646..d3d8cdc3e78 100644 --- a/clang/test/CodeGenObjC/debug-info-ivars-private.m +++ b/clang/test/CodeGenObjC/debug-info-ivars-private.m @@ -32,14 +32,14 @@ __attribute((objc_root_class)) @interface NSObject { } @end -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "foo" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "foo" // CHECK-SAME: line: 14 // CHECK-SAME: baseType: ![[INT:[0-9]+]] // CHECK-SAME: size: 32, align: 32, // CHECK-NOT: offset: // CHECK-SAME: flags: DIFlagProtected -// CHECK: ![[INT]] = !MDBasicType(name: "int" -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "bar" +// CHECK: ![[INT]] = !DIBasicType(name: "int" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "bar" // CHECK-SAME: line: 27 // CHECK-SAME: baseType: ![[INT:[0-9]+]] // CHECK-SAME: size: 32, align: 32, diff --git a/clang/test/CodeGenObjC/debug-info-ivars.m b/clang/test/CodeGenObjC/debug-info-ivars.m index a6d8886eec0..aea3edaa8ae 100644 --- a/clang/test/CodeGenObjC/debug-info-ivars.m +++ b/clang/test/CodeGenObjC/debug-info-ivars.m @@ -18,26 +18,26 @@ __attribute((objc_root_class)) @interface NSObject { @implementation BaseClass @end -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "i" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "i" // CHECK-SAME: line: 10 // CHECK-SAME: baseType: ![[INT:[0-9]+]] // CHECK-SAME: size: 32, align: 32, // CHECK-NOT: offset: // CHECK-SAME: flags: DIFlagProtected -// CHECK: ![[INT]] = !MDBasicType(name: "int" -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "flag_1" +// CHECK: ![[INT]] = !DIBasicType(name: "int" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "flag_1" // CHECK-SAME: line: 11 // CHECK-SAME: baseType: ![[UNSIGNED:[0-9]+]] // CHECK-SAME: size: 9, align: 32, // CHECK-NOT: offset: // CHECK-SAME: flags: DIFlagProtected -// CHECK: ![[UNSIGNED]] = !MDBasicType(name: "unsigned int" -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "flag_2" +// CHECK: ![[UNSIGNED]] = !DIBasicType(name: "unsigned int" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "flag_2" // CHECK-SAME: line: 12 // CHECK-SAME: baseType: ![[UNSIGNED]] // CHECK-SAME: size: 9, align: 32, offset: 1, // CHECK-SAME: flags: DIFlagProtected -// CHECK: !MDDerivedType(tag: DW_TAG_member, name: "flag_3" +// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "flag_3" // CHECK-SAME: line: 14 // CHECK-SAME: baseType: ![[UNSIGNED]] // CHECK-SAME: size: 9, align: 32, offset: 3, diff --git a/clang/test/CodeGenObjC/debug-info-lifetime-crash.m b/clang/test/CodeGenObjC/debug-info-lifetime-crash.m index 67285ce0d6e..bbd7dd4ac3b 100644 --- a/clang/test/CodeGenObjC/debug-info-lifetime-crash.m +++ b/clang/test/CodeGenObjC/debug-info-lifetime-crash.m @@ -13,12 +13,12 @@ { // The debug type for these two will be identical, because we do not // actually emit the ownership qualifier. - // CHECK: !MDLocalVariable(tag: DW_TAG_auto_variable, name: "weakSelf", + // CHECK: !DILocalVariable(tag: DW_TAG_auto_variable, name: "weakSelf", // CHECK-SAME: line: [[@LINE+2]] // CHECK-SAME: type: ![[SELFTY:[0-9]+]] __attribute__((objc_ownership(weak))) __typeof(self) weakSelf = self; Block = [^{ - // CHECK: !MDLocalVariable(tag: DW_TAG_auto_variable, name: "strongSelf", + // CHECK: !DILocalVariable(tag: DW_TAG_auto_variable, name: "strongSelf", // CHECK-SAME: line: [[@LINE+2]] // CHECK-SAME: type: ![[SELFTY]] __attribute__((objc_ownership(strong))) __typeof(self) strongSelf = weakSelf; diff --git a/clang/test/CodeGenObjC/debug-info-property-accessors.m b/clang/test/CodeGenObjC/debug-info-property-accessors.m index 01fbe58bdd3..274bf6e74db 100644 --- a/clang/test/CodeGenObjC/debug-info-property-accessors.m +++ b/clang/test/CodeGenObjC/debug-info-property-accessors.m @@ -5,7 +5,7 @@ // Ensure we emit the names of explicit/renamed accessors even if they // are defined later in the implementation section. // -// CHECK: !MDObjCProperty(name: "blah" +// CHECK: !DIObjCProperty(name: "blah" // CHECK-SAME: getter: "isBlah" @class NSString; diff --git a/clang/test/CodeGenObjC/debug-info-property3.m b/clang/test/CodeGenObjC/debug-info-property3.m index 1b9599865ec..68cb234878a 100644 --- a/clang/test/CodeGenObjC/debug-info-property3.m +++ b/clang/test/CodeGenObjC/debug-info-property3.m @@ -1,7 +1,7 @@ // RUN: %clang_cc1 -S -emit-llvm -g %s -o - | FileCheck %s @interface I1 -// CHECK: !MDObjCProperty(name: "p1" +// CHECK: !DIObjCProperty(name: "p1" // CHECK-SAME: line: [[@LINE+2]] // CHECK-SAME: attributes: 2316 @property int p1; diff --git a/clang/test/CodeGenObjC/debug-info-pubtypes.m b/clang/test/CodeGenObjC/debug-info-pubtypes.m index dd30f6cb906..e95ddab9049 100644 --- a/clang/test/CodeGenObjC/debug-info-pubtypes.m +++ b/clang/test/CodeGenObjC/debug-info-pubtypes.m @@ -1,7 +1,7 @@ // REQUIRES: x86-registered-target // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -g -emit-llvm %s -o - | FileCheck %s -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "H" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "H" // CHECK-SAME: line: [[@LINE+1]], @interface H -(void) foo; diff --git a/clang/test/CodeGenObjC/debug-info-self.m b/clang/test/CodeGenObjC/debug-info-self.m index 58a753c32a1..225a0bdef63 100644 --- a/clang/test/CodeGenObjC/debug-info-self.m +++ b/clang/test/CodeGenObjC/debug-info-self.m @@ -14,15 +14,15 @@ } @end -// CHECK: !MDLocalVariable(tag: DW_TAG_arg_variable, name: "self", arg: 1, +// CHECK: !DILocalVariable(tag: DW_TAG_arg_variable, name: "self", arg: 1, // CHECK-SAME: scope: ![[CTOR:[0-9]+]] // CHECK-NOT: line: // CHECK-SAME: flags: DIFlagArtificial | DIFlagObjectPointer{{[,)]}} -// CHECK: !MDLocalVariable(tag: DW_TAG_arg_variable, name: "_cmd", arg: 2, +// CHECK: !DILocalVariable(tag: DW_TAG_arg_variable, name: "_cmd", arg: 2, // CHECK-SAME: scope: ![[CTOR]] // CHECK-NOT: line: // CHECK-SAME: flags: DIFlagArtificial{{[,)]}} -// CHECK: !MDLocalVariable(tag: DW_TAG_arg_variable, name: "myarg", arg: 3, +// CHECK: !DILocalVariable(tag: DW_TAG_arg_variable, name: "myarg", arg: 3, // CHECK-SAME: scope: ![[CTOR]] // CHECK-SAME: line: 11 // CHECK-NOT: flags: diff --git a/clang/test/CodeGenObjC/debug-info-static-var.m b/clang/test/CodeGenObjC/debug-info-static-var.m index ac615d89215..50334250dfa 100644 --- a/clang/test/CodeGenObjC/debug-info-static-var.m +++ b/clang/test/CodeGenObjC/debug-info-static-var.m @@ -2,7 +2,7 @@ // Radar 8801045 // Do not emit AT_MIPS_linkage_name for static variable i -// CHECK: !MDGlobalVariable(name: "i" +// CHECK: !DIGlobalVariable(name: "i" // CHECK-NOT: linkageName: // CHECK-SAME: ){{$}} diff --git a/clang/test/CodeGenObjC/debug-info-synthesis.m b/clang/test/CodeGenObjC/debug-info-synthesis.m index ad9bea762a1..2bf001b28cb 100644 --- a/clang/test/CodeGenObjC/debug-info-synthesis.m +++ b/clang/test/CodeGenObjC/debug-info-synthesis.m @@ -30,8 +30,8 @@ int main(int argc, char *argv[]) { } } -// CHECK: ![[FILE:.*]] = !MDFile(filename: "{{[^"]+}}foo.h" -// CHECK: !MDSubprogram(name: "-[Foo setDict:]" +// CHECK: ![[FILE:.*]] = !DIFile(filename: "{{[^"]+}}foo.h" +// CHECK: !DISubprogram(name: "-[Foo setDict:]" // CHECK-SAME: file: ![[FILE]], // CHECK-SAME: line: 8, // CHECK-SAME: isLocal: true, isDefinition: true diff --git a/clang/test/CodeGenObjC/debug-info-variadic-method.m b/clang/test/CodeGenObjC/debug-info-variadic-method.m index 7f9ad276c81..828d4dc4a16 100644 --- a/clang/test/CodeGenObjC/debug-info-variadic-method.m +++ b/clang/test/CodeGenObjC/debug-info-variadic-method.m @@ -10,7 +10,7 @@ @implementation Foo - (void) Bar: (int) n, ... { - // CHECK: !MDSubroutineType(types: ![[NUM:[0-9]+]]) + // CHECK: !DISubroutineType(types: ![[NUM:[0-9]+]]) // CHECK: ![[NUM]] = {{!{null, ![^,]*, ![^,]*, ![^,]*, null}}} } @end diff --git a/clang/test/CodeGenObjC/debug-property-synth.m b/clang/test/CodeGenObjC/debug-property-synth.m index 37ff11f51ae..8367478b943 100644 --- a/clang/test/CodeGenObjC/debug-property-synth.m +++ b/clang/test/CodeGenObjC/debug-property-synth.m @@ -18,10 +18,10 @@ // CHECK-NOT: ret // CHECK: load {{.*}}, !dbg ![[DBG2:[0-9]+]] // -// CHECK: !MDSubprogram(name: "-[I p1]",{{.*}} line: [[@LINE+4]],{{.*}} isLocal: true, isDefinition: true -// CHECK: !MDSubprogram(name: "-[I setP1:]",{{.*}} line: [[@LINE+3]],{{.*}} isLocal: true, isDefinition: true -// CHECK: ![[DBG1]] = !MDLocation(line: [[@LINE+2]], -// CHECK: ![[DBG2]] = !MDLocation(line: [[@LINE+1]], +// CHECK: !DISubprogram(name: "-[I p1]",{{.*}} line: [[@LINE+4]],{{.*}} isLocal: true, isDefinition: true +// CHECK: !DISubprogram(name: "-[I setP1:]",{{.*}} line: [[@LINE+3]],{{.*}} isLocal: true, isDefinition: true +// CHECK: ![[DBG1]] = !DILocation(line: [[@LINE+2]], +// CHECK: ![[DBG2]] = !DILocation(line: [[@LINE+1]], @property int p1; @end diff --git a/clang/test/CodeGenObjC/debuginfo-properties.m b/clang/test/CodeGenObjC/debuginfo-properties.m index 707d234b741..b2c479c0310 100644 --- a/clang/test/CodeGenObjC/debuginfo-properties.m +++ b/clang/test/CodeGenObjC/debuginfo-properties.m @@ -11,16 +11,16 @@ @protocol HasASelection <NSObject> @property (nonatomic, retain) Selection* selection; -// CHECK: !MDSubprogram(name: "-[MyClass selection]" +// CHECK: !DISubprogram(name: "-[MyClass selection]" // CHECK-SAME: line: [[@LINE-2]] // CHECK-SAME: isLocal: true, isDefinition: true -// CHECK: !MDSubprogram(name: "-[MyClass setSelection:]" +// CHECK: !DISubprogram(name: "-[MyClass setSelection:]" // CHECK-SAME: line: [[@LINE-5]] // CHECK-SAME: isLocal: true, isDefinition: true -// CHECK: !MDSubprogram(name: "-[OtherClass selection]" +// CHECK: !DISubprogram(name: "-[OtherClass selection]" // CHECK-SAME: line: [[@LINE-8]] // CHECK-SAME: isLocal: true, isDefinition: true -// CHECK: !MDSubprogram(name: "-[OtherClass setSelection:]" +// CHECK: !DISubprogram(name: "-[OtherClass setSelection:]" // CHECK-SAME: line: [[@LINE-11]] // CHECK-SAME: isLocal: true, isDefinition: true diff --git a/clang/test/CodeGenObjC/objc-fixed-enum.m b/clang/test/CodeGenObjC/objc-fixed-enum.m index dbac91df840..52811b1d68b 100644 --- a/clang/test/CodeGenObjC/objc-fixed-enum.m +++ b/clang/test/CodeGenObjC/objc-fixed-enum.m @@ -46,35 +46,35 @@ int main() { // -treated as C++11 strongly typed enums. return e0 != e1 && e1 == e2 && e2 == e3; } -// CHECK: ![[ENUMERATOR0:[0-9]+]] = !MDCompositeType(tag: DW_TAG_enumeration_type +// CHECK: ![[ENUMERATOR0:[0-9]+]] = !DICompositeType(tag: DW_TAG_enumeration_type // CHECK-SAME: line: 10, -// CHECK: ![[ENUMERATOR1:[0-9]+]] = !MDCompositeType(tag: DW_TAG_enumeration_type, name: "Enum1" +// CHECK: ![[ENUMERATOR1:[0-9]+]] = !DICompositeType(tag: DW_TAG_enumeration_type, name: "Enum1" // CHECK-SAME: line: 16 // CHECK-SAME: baseType: ![[ENUMERATOR3:[0-9]+]] -// CHECK: ![[ENUMERATOR3]] = !MDDerivedType(tag: DW_TAG_typedef, name: "NSInteger" +// CHECK: ![[ENUMERATOR3]] = !DIDerivedType(tag: DW_TAG_typedef, name: "NSInteger" // CHECK-SAME: line: 6 // CHECK-SAME: baseType: ![[LONGINT:[0-9]+]] -// CHECK: ![[LONGINT]] = !MDBasicType(name: "long int" -// CHECK: ![[ENUMERATOR2:[0-9]+]] = !MDCompositeType(tag: DW_TAG_enumeration_type, +// CHECK: ![[LONGINT]] = !DIBasicType(name: "long int" +// CHECK: ![[ENUMERATOR2:[0-9]+]] = !DICompositeType(tag: DW_TAG_enumeration_type, // CHECK-SAME: line: 22 // CHECK-SAME: baseType: ![[ENUMERATOR3]] -// CHECK: ![[ENUM0]] = !MDLocalVariable(tag: DW_TAG_auto_variable, name: "e0" +// CHECK: ![[ENUM0]] = !DILocalVariable(tag: DW_TAG_auto_variable, name: "e0" // CHECK-SAME: type: ![[TYPE0:[0-9]+]] -// CHECK: ![[TYPE0]] = !MDDerivedType(tag: DW_TAG_typedef, name: "Enum0", +// CHECK: ![[TYPE0]] = !DIDerivedType(tag: DW_TAG_typedef, name: "Enum0", // CHECK-SAME: baseType: ![[ENUMERATOR0]] -// CHECK: ![[ENUM1]] = !MDLocalVariable(tag: DW_TAG_auto_variable, name: "e1" +// CHECK: ![[ENUM1]] = !DILocalVariable(tag: DW_TAG_auto_variable, name: "e1" // CHECK-SAME: type: ![[TYPE1:[0-9]+]] -// CHECK: ![[TYPE1]] = !MDDerivedType(tag: DW_TAG_typedef, name: "Enum1" +// CHECK: ![[TYPE1]] = !DIDerivedType(tag: DW_TAG_typedef, name: "Enum1" // CHECK-SAME: baseType: ![[ENUMERATOR1]] -// CHECK: ![[ENUM2]] = !MDLocalVariable(tag: DW_TAG_auto_variable, name: "e2" +// CHECK: ![[ENUM2]] = !DILocalVariable(tag: DW_TAG_auto_variable, name: "e2" // CHECK-SAME: type: ![[TYPE2:[0-9]+]] -// CHECK: ![[TYPE2]] = !MDDerivedType(tag: DW_TAG_typedef, name: "Enum2" +// CHECK: ![[TYPE2]] = !DIDerivedType(tag: DW_TAG_typedef, name: "Enum2" // CHECK-SAME: baseType: ![[ENUMERATOR2]] -// CHECK: ![[ENUM3]] = !MDLocalVariable(tag: DW_TAG_auto_variable, name: "e3" +// CHECK: ![[ENUM3]] = !DILocalVariable(tag: DW_TAG_auto_variable, name: "e3" // CHECK-SAME: type: ![[TYPE3:[0-9]+]] -// CHECK: ![[TYPE3]] = !MDDerivedType(tag: DW_TAG_typedef, name: "Enum3" +// CHECK: ![[TYPE3]] = !DIDerivedType(tag: DW_TAG_typedef, name: "Enum3" // CHECK-SAME: baseType: ![[ENUMERATOR3]] diff --git a/clang/test/CodeGenObjCXX/debug-info-cyclic.mm b/clang/test/CodeGenObjCXX/debug-info-cyclic.mm index fdae22b5117..8983fe51120 100644 --- a/clang/test/CodeGenObjCXX/debug-info-cyclic.mm +++ b/clang/test/CodeGenObjCXX/debug-info-cyclic.mm @@ -1,7 +1,7 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin -g -emit-llvm %s -o - | FileCheck %s struct B { -// CHECK: ![[B:[0-9]+]] = !MDCompositeType(tag: DW_TAG_structure_type, name: "B" +// CHECK: ![[B:[0-9]+]] = !DICompositeType(tag: DW_TAG_structure_type, name: "B" // CHECK-SAME: line: [[@LINE-2]], // CHECK-SAME: size: 8, align: 8, // CHECK-NOT: offset: @@ -9,12 +9,12 @@ struct B { // CHECK-SAME: elements: ![[BMEMBERS:[0-9]+]] // CHECK: ![[BMEMBERS]] = !{![[BB:[0-9]+]]} B(struct A *); -// CHECK: ![[BB]] = !MDSubprogram(name: "B", scope: ![[B]] +// CHECK: ![[BB]] = !DISubprogram(name: "B", scope: ![[B]] // CHECK-SAME: line: [[@LINE-2]], // CHECK-SAME: type: ![[TY:[0-9]+]], -// CHECK: ![[TY]] = !MDSubroutineType(types: ![[ARGS:[0-9]+]]) +// CHECK: ![[TY]] = !DISubroutineType(types: ![[ARGS:[0-9]+]]) // CHECK: ![[ARGS]] = !{null, ![[THIS:[0-9]+]], !{{[^,]+}}} -// CHECK: ![[THIS]] = !MDDerivedType(tag: DW_TAG_pointer_type, +// CHECK: ![[THIS]] = !DIDerivedType(tag: DW_TAG_pointer_type, // CHECK-SAME: baseType: ![[B]] }; diff --git a/clang/test/CodeGenObjCXX/debug-info-line.mm b/clang/test/CodeGenObjCXX/debug-info-line.mm index 4c934f12070..a7d6a155998 100644 --- a/clang/test/CodeGenObjCXX/debug-info-line.mm +++ b/clang/test/CodeGenObjCXX/debug-info-line.mm @@ -26,5 +26,5 @@ void f1() { } @end -// CHECK: [[DBG_F1]] = !MDLocation(line: 100, -// CHECK: [[DBG_TNSO]] = !MDLocation(line: 200, +// CHECK: [[DBG_F1]] = !DILocation(line: 100, +// CHECK: [[DBG_TNSO]] = !DILocation(line: 200, diff --git a/clang/test/Driver/darwin-debug-flags.c b/clang/test/Driver/darwin-debug-flags.c index 0f3ce79605e..17b0bba17c6 100644 --- a/clang/test/Driver/darwin-debug-flags.c +++ b/clang/test/Driver/darwin-debug-flags.c @@ -5,7 +5,7 @@ // <rdar://problem/12955296> // RUN: %clang -### -target i386-apple-darwin9 -c -g %t.s 2>&1 | FileCheck -check-prefix=P %s -// CHECK: !0 = !MDCompileUnit( +// CHECK: !0 = !DICompileUnit( // CHECK-SAME: flags: // CHECK-SAME: -I path\5C with\5C \5C\5Cspaces // CHECK-SAME: -g -Os diff --git a/clang/test/OpenMP/atomic_codegen.cpp b/clang/test/OpenMP/atomic_codegen.cpp index 813b66c65a4..ba8c945de33 100644 --- a/clang/test/OpenMP/atomic_codegen.cpp +++ b/clang/test/OpenMP/atomic_codegen.cpp @@ -104,7 +104,7 @@ void parallel_atomic() { // TERM_DEBUG: call void @__clang_call_terminate // TERM_DEBUG: unreachable } -// TERM_DEBUG-DAG: [[READ_LOC]] = !MDLocation(line: [[@LINE-33]], -// TERM_DEBUG-DAG: [[WRITE_LOC]] = !MDLocation(line: [[@LINE-28]], -// TERM_DEBUG-DAG: [[UPDATE_LOC]] = !MDLocation(line: [[@LINE-22]], -// TERM_DEBUG-DAG: [[CAPTURE_LOC]] = !MDLocation(line: [[@LINE-16]], +// TERM_DEBUG-DAG: [[READ_LOC]] = !DILocation(line: [[@LINE-33]], +// TERM_DEBUG-DAG: [[WRITE_LOC]] = !DILocation(line: [[@LINE-28]], +// TERM_DEBUG-DAG: [[UPDATE_LOC]] = !DILocation(line: [[@LINE-22]], +// TERM_DEBUG-DAG: [[CAPTURE_LOC]] = !DILocation(line: [[@LINE-16]], diff --git a/clang/test/OpenMP/critical_codegen.cpp b/clang/test/OpenMP/critical_codegen.cpp index cf99a752025..6e68b2c4f4a 100644 --- a/clang/test/OpenMP/critical_codegen.cpp +++ b/clang/test/OpenMP/critical_codegen.cpp @@ -53,6 +53,6 @@ void parallel_critical() { // TERM_DEBUG: unreachable foo(); } -// TERM_DEBUG-DAG: [[DBG_LOC_START]] = !MDLocation(line: [[@LINE-12]], -// TERM_DEBUG-DAG: [[DBG_LOC_END]] = !MDLocation(line: [[@LINE-3]], +// TERM_DEBUG-DAG: [[DBG_LOC_START]] = !DILocation(line: [[@LINE-12]], +// TERM_DEBUG-DAG: [[DBG_LOC_END]] = !DILocation(line: [[@LINE-3]], #endif diff --git a/clang/test/OpenMP/for_codegen.cpp b/clang/test/OpenMP/for_codegen.cpp index 85f1ba69b27..41cc4c0143c 100644 --- a/clang/test/OpenMP/for_codegen.cpp +++ b/clang/test/OpenMP/for_codegen.cpp @@ -361,9 +361,9 @@ void parallel_for(float *a) { a[i] += foo(); } // Check source line corresponds to "#pragma omp for schedule(static, 5)" above: -// TERM_DEBUG-DAG: [[DBG_LOC_START]] = !MDLocation(line: [[@LINE-15]], -// TERM_DEBUG-DAG: [[DBG_LOC_END]] = !MDLocation(line: [[@LINE-16]], -// TERM_DEBUG-DAG: [[DBG_LOC_CANCEL]] = !MDLocation(line: [[@LINE-17]], +// TERM_DEBUG-DAG: [[DBG_LOC_START]] = !DILocation(line: [[@LINE-15]], +// TERM_DEBUG-DAG: [[DBG_LOC_END]] = !DILocation(line: [[@LINE-16]], +// TERM_DEBUG-DAG: [[DBG_LOC_CANCEL]] = !DILocation(line: [[@LINE-17]], #endif // HEADER diff --git a/clang/test/OpenMP/master_codegen.cpp b/clang/test/OpenMP/master_codegen.cpp index 8dfd53c5624..732a9054482 100644 --- a/clang/test/OpenMP/master_codegen.cpp +++ b/clang/test/OpenMP/master_codegen.cpp @@ -61,7 +61,7 @@ void parallel_master() { // TERM_DEBUG: unreachable foo(); } -// TERM_DEBUG-DAG: [[DBG_LOC_START]] = !MDLocation(line: [[@LINE-12]], -// TERM_DEBUG-DAG: [[DBG_LOC_END]] = !MDLocation(line: [[@LINE-3]], +// TERM_DEBUG-DAG: [[DBG_LOC_START]] = !DILocation(line: [[@LINE-12]], +// TERM_DEBUG-DAG: [[DBG_LOC_END]] = !DILocation(line: [[@LINE-3]], #endif diff --git a/clang/test/OpenMP/parallel_for_codegen.cpp b/clang/test/OpenMP/parallel_for_codegen.cpp index 3942fad9328..058bcfc3841 100644 --- a/clang/test/OpenMP/parallel_for_codegen.cpp +++ b/clang/test/OpenMP/parallel_for_codegen.cpp @@ -368,9 +368,9 @@ void parallel_for(float *a) { a[i] += foo(); } // Check source line corresponds to "#pragma omp parallel for schedule(static, 5)" above: -// TERM_DEBUG-DAG: [[DBG_LOC_START]] = !MDLocation(line: [[@LINE-4]], -// TERM_DEBUG-DAG: [[DBG_LOC_END]] = !MDLocation(line: [[@LINE-16]], -// TERM_DEBUG-DAG: [[DBG_LOC_CANCEL]] = !MDLocation(line: [[@LINE-17]], +// TERM_DEBUG-DAG: [[DBG_LOC_START]] = !DILocation(line: [[@LINE-4]], +// TERM_DEBUG-DAG: [[DBG_LOC_END]] = !DILocation(line: [[@LINE-16]], +// TERM_DEBUG-DAG: [[DBG_LOC_CANCEL]] = !DILocation(line: [[@LINE-17]], #endif // HEADER diff --git a/clang/test/OpenMP/simd_codegen.cpp b/clang/test/OpenMP/simd_codegen.cpp index c6381682580..022dabc03ec 100644 --- a/clang/test/OpenMP/simd_codegen.cpp +++ b/clang/test/OpenMP/simd_codegen.cpp @@ -473,6 +473,6 @@ void parallel_simd(float *a) { for (unsigned i = 131071; i <= 2147483647; i += 127) a[i] += bar(); } -// TERM_DEBUG: !{{[0-9]+}} = !MDLocation(line: [[@LINE-11]], +// TERM_DEBUG: !{{[0-9]+}} = !DILocation(line: [[@LINE-11]], #endif // HEADER diff --git a/clang/test/OpenMP/single_codegen.cpp b/clang/test/OpenMP/single_codegen.cpp index 19574bf1f34..eca7e0e4bee 100644 --- a/clang/test/OpenMP/single_codegen.cpp +++ b/clang/test/OpenMP/single_codegen.cpp @@ -164,7 +164,7 @@ void parallel_single() { // TERM_DEBUG: unreachable foo(); } -// TERM_DEBUG-DAG: [[DBG_LOC_START]] = !MDLocation(line: [[@LINE-12]], -// TERM_DEBUG-DAG: [[DBG_LOC_END]] = !MDLocation(line: [[@LINE-3]], +// TERM_DEBUG-DAG: [[DBG_LOC_START]] = !DILocation(line: [[@LINE-12]], +// TERM_DEBUG-DAG: [[DBG_LOC_END]] = !DILocation(line: [[@LINE-3]], #endif diff --git a/clang/test/PCH/debug-info-limited-struct.c b/clang/test/PCH/debug-info-limited-struct.c index 65f1d12b53d..067f98165a2 100644 --- a/clang/test/PCH/debug-info-limited-struct.c +++ b/clang/test/PCH/debug-info-limited-struct.c @@ -1,6 +1,6 @@ // RUN: %clang_cc1 -emit-pch -o %t %S/debug-info-limited-struct.h // RUN: %clang_cc1 -include-pch %t -emit-llvm %s -g -o - | FileCheck %s -// CHECK: !MDCompositeType(tag: DW_TAG_structure_type, name: "foo" +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "foo" // CHECK-NOT: flags: {{[^,]*}}FlagFwdDecl // CHECK-SAME: {{$}} diff --git a/clang/test/VFS/external-names.c b/clang/test/VFS/external-names.c index a800f1c798d..28521b466c3 100644 --- a/clang/test/VFS/external-names.c +++ b/clang/test/VFS/external-names.c @@ -28,8 +28,8 @@ // Debug info // RUN: %clang_cc1 -I %t -ivfsoverlay %t.external.yaml -triple %itanium_abi_triple -g -emit-llvm %s -o - | FileCheck -check-prefix=CHECK-DEBUG-EXTERNAL %s -// CHECK-DEBUG-EXTERNAL: !MDSubprogram({{.*}}file: ![[Num:[0-9]+]] -// CHECK-DEBUG-EXTERNAL: ![[Num]] = !MDFile(filename: "{{[^"]*}}Inputs{{.}}external-names.h" +// CHECK-DEBUG-EXTERNAL: !DISubprogram({{.*}}file: ![[Num:[0-9]+]] +// CHECK-DEBUG-EXTERNAL: ![[Num]] = !DIFile(filename: "{{[^"]*}}Inputs{{.}}external-names.h" // RUN: %clang_cc1 -I %t -ivfsoverlay %t.yaml -triple %itanium_abi_triple -g -emit-llvm %s -o - | FileCheck -check-prefix=CHECK-DEBUG %s // CHECK-DEBUG-NOT: Inputs |
