Author: Amy Huang Date: 2020-04-07T09:25:16-07:00 New Revision: dace7ada3814d87171e3a8be154f315e1f9d6029
URL: https://github.com/llvm/llvm-project/commit/dace7ada3814d87171e3a8be154f315e1f9d6029 DIFF: https://github.com/llvm/llvm-project/commit/dace7ada3814d87171e3a8be154f315e1f9d6029.diff LOG: Slightly modify some tests as follow up to bcf66084, which breaks tests. The change in bcf6604 added a debug info flag, which caused some tests to fail; I removed some commas so that the test matching still works. Added: Modified: clang/test/Modules/ExtDebugInfo.cpp clang/test/Modules/ModuleDebugInfo.cpp Removed: ################################################################################ diff --git a/clang/test/Modules/ExtDebugInfo.cpp b/clang/test/Modules/ExtDebugInfo.cpp index a66c678227fe..6781810d592c 100644 --- a/clang/test/Modules/ExtDebugInfo.cpp +++ b/clang/test/Modules/ExtDebugInfo.cpp @@ -77,7 +77,7 @@ void foo() { // CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "Enum", // CHECK-SAME: scope: ![[NS:[0-9]+]], -// CHECK-SAME: flags: DIFlagFwdDecl, +// CHECK-SAME: flags: DIFlagFwdDecl // CHECK-SAME: identifier: "_ZTSN8DebugCXX4EnumE") // CHECK: ![[NS]] = !DINamespace(name: "DebugCXX", scope: ![[MOD:[0-9]+]]) @@ -94,7 +94,7 @@ void foo() { // CHECK: !DICompositeType(tag: DW_TAG_class_type, // CHECK-SAME: name: "Template<int, DebugCXX::traits<int>>", // CHECK-SAME: scope: ![[NS]], -// CHECK-SAME: flags: DIFlagFwdDecl, +// CHECK-SAME: flags: DIFlagFwdDecl // CHECK-SAME: identifier: "_ZTSN8DebugCXX8TemplateIiNS_6traitsIiEEEE") // This type isn't, however, even with standalone non-module debug info this @@ -111,7 +111,7 @@ void foo() { // This type is anchored in the module by an explicit template instantiation. // CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "traits<float>", -// CHECK-SAME: flags: DIFlagFwdDecl, +// CHECK-SAME: flags: DIFlagFwdDecl // CHECK-SAME: identifier: "_ZTSN8DebugCXX6traitsIfEE") @@ -127,11 +127,11 @@ void foo() { // CHECK: ![[STRUCT]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Struct", // CHECK-SAME: scope: ![[NS]], -// CHECK-SAME: flags: DIFlagFwdDecl, +// CHECK-SAME: flags: DIFlagFwdDecl // CHECK-SAME: identifier: "_ZTSN8DebugCXX6StructE") // CHECK: !DICompositeType(tag: DW_TAG_union_type, -// CHECK-SAME: flags: DIFlagFwdDecl, +// CHECK-SAME: flags: DIFlagFwdDecl // CHECK-SAME: identifier: "_ZTS12TypedefUnion") // CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, // CHECK-SAME: flags: DIFlagFwdDecl, @@ -214,8 +214,9 @@ void foo() { // CHECK-PCH: dwoId: 18446744073709551614 // CHECK: !DICompositeType(tag: DW_TAG_class_type, name: "A", -// CHECK-SAME: DIFlagFwdDecl) +// CHECK-SAME: DIFlagFwdDecl // There is a full definition of the type available in the module. // CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "Virtual", -// CHECK-SAME: DIFlagFwdDecl, identifier: "_ZTS7Virtual") +// CHECK-SAME: DIFlagFwdDecl +// CHECK-SAME: identifier: "_ZTS7Virtual") diff --git a/clang/test/Modules/ModuleDebugInfo.cpp b/clang/test/Modules/ModuleDebugInfo.cpp index c361053d03cd..26369c896058 100644 --- a/clang/test/Modules/ModuleDebugInfo.cpp +++ b/clang/test/Modules/ModuleDebugInfo.cpp @@ -133,7 +133,7 @@ // CHECK-SAME: baseType: ![[BASE:.*]]) // CHECK: ![[BASE]] = !DICompositeType(tag: DW_TAG_class_type, // CHECK-SAME: name: "Template1<void *>", -// CHECK-SAME: flags: DIFlagFwdDecl, +// CHECK-SAME: flags: DIFlagFwdDecl // CHECK-SAME: identifier: "_ZTS9Template1IPvE") // Explicit instantiation. @@ -154,7 +154,7 @@ // CHECK-SAME: baseType: ![[SPECIALIZEDBASE:.*]]) // CHECK: ![[SPECIALIZEDBASE]] = !DICompositeType(tag: DW_TAG_class_type, // CHECK-SAME: name: "WithSpecializedBase<float>", -// CHECK-SAME: flags: DIFlagFwdDecl, +// CHECK-SAME: flags: DIFlagFwdDecl // CHECK-MOD: !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: ![[DEBUGCXX]], // CHECK-MOD-SAME: entity: ![[DUMMY:[0-9]+]], _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
