Author: dblaikie Date: Thu Apr 25 13:05:47 2019 New Revision: 359235 URL: http://llvm.org/viewvc/llvm-project?rev=359235&view=rev Log: Skip type units/type uniquing when we know we're only emitting the type once (vtable-based emission when triggered by a strong vtable, with -fno-standalone-debug)
(this would regress size without a corresponding LLVM change that avoids putting other user defined types inside type units when they aren't in their own type units - instead emitting declarations inside the type unit and a definition in the primary CU) Reviewers: aprantl Differential Revision: https://reviews.llvm.org/D61079 Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp cfe/trunk/test/CodeGenCXX/debug-info-class.cpp cfe/trunk/test/Modules/ExtDebugInfo.cpp cfe/trunk/test/Modules/ModuleDebugInfo.cpp Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=359235&r1=359234&r2=359235&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original) +++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Thu Apr 25 13:05:47 2019 @@ -915,6 +915,11 @@ static SmallString<256> getTypeIdentifie if (!needsTypeIdentifier(TD, CGM, TheCU)) return Identifier; + if (const auto *RD = dyn_cast<CXXRecordDecl>(TD)) + if (RD->getDefinition()) + if (RD->isDynamicClass() && + CGM.getVTableLinkage(RD) == llvm::GlobalValue::ExternalLinkage) + return Identifier; // TODO: This is using the RTTI name. Is there a better way to get // a unique string for a type? Modified: cfe/trunk/test/CodeGenCXX/debug-info-class.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-class.cpp?rev=359235&r1=359234&r2=359235&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCXX/debug-info-class.cpp (original) +++ cfe/trunk/test/CodeGenCXX/debug-info-class.cpp Thu Apr 25 13:05:47 2019 @@ -57,6 +57,11 @@ struct I : virtual H {}; struct J : I {}; J j; +struct K { + virtual void func() { + } +}; + struct A { int one; static const int HdrSize = 52; @@ -72,6 +77,8 @@ void f1() { E y; int i = F::i; F::inner z; + K k; + k.func(); } int main(int argc, char **argv) { @@ -98,7 +105,8 @@ int main(int argc, char **argv) { // CHECK: [[F:![0-9]*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "F" // CHECK-SAME: DIFlagFwdDecl -// CHECK-SAME: identifier: "_ZTS1F" +// CHECK-NOT: identifier: +// CHECK-SAME: ){{$}} // CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "I" // CHECK-NOT: DIFlagFwdDecl // CHECK-SAME: ){{$}} @@ -117,7 +125,8 @@ int main(int argc, char **argv) { // CHECK-NOT: DIFlagFwdDecl // CHECK-SAME: elements: [[C_MEM:![0-9]*]] // CHECK-SAME: vtableHolder: [[C]] -// CHECK-SAME: identifier: "_ZTS1C" +// CHECK-NOT: identifier: +// CHECK-SAME: ){{$}} // CHECK: [[C_MEM]] = !{[[C_VPTR:![0-9]*]], [[C_S:![0-9]*]], [[C_DTOR:![0-9]*]]} // CHECK: [[C_VPTR]] = !DIDerivedType(tag: DW_TAG_member, name: "_vptr$C" // CHECK-SAME: DIFlagArtificial @@ -129,10 +138,16 @@ int main(int argc, char **argv) { // CHECK: [[D:![0-9]+]] = !DICompositeType(tag: DW_TAG_structure_type, name: "D" // CHECK-NOT: size: // CHECK-SAME: DIFlagFwdDecl -// CHECK-SAME: identifier: "_ZTS1D" +// CHECK-NOT: identifier: +// CHECK-SAME: ){{$}} // CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "E" // CHECK-SAME: DIFlagFwdDecl -// CHECK-SAME: identifier: "_ZTS1E" +// CHECK-NOT: identifier: +// CHECK-SAME: ){{$}} + +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "K" +// CHECK-SAME: identifier: "_ZTS1K" +// CHECK-SAME: ){{$}} // CHECK: !DISubprogram(name: "func",{{.*}} scope: [[D]] // CHECK-SAME: DISPFlagDefinition @@ -146,7 +161,8 @@ int main(int argc, char **argv) { // CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "G" // CHECK-SAME: DIFlagFwdDecl -// CHECK-SAME: identifier: "_ZTS1G" +// CHECK-NOT: identifier: +// CHECK-SAME: ){{$}} // CHECK: [[G_INNER_MEM]] = !{[[G_INNER_I:![0-9]*]]} // CHECK: [[G_INNER_I]] = !DIDerivedType(tag: DW_TAG_member, name: "j" // CHECK-SAME: baseType: ![[INT]] @@ -154,5 +170,5 @@ int main(int argc, char **argv) { // CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "A" // CHECK: !DIDerivedType(tag: DW_TAG_member, name: "HdrSize" // -// CHECK: ![[EXCEPTLOC]] = !DILocation(line: 84, -// CHECK: ![[RETLOC]] = !DILocation(line: 83, +// CHECK: ![[EXCEPTLOC]] = !DILocation(line: 91, +// CHECK: ![[RETLOC]] = !DILocation(line: 90, Modified: cfe/trunk/test/Modules/ExtDebugInfo.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/ExtDebugInfo.cpp?rev=359235&r1=359234&r2=359235&view=diff ============================================================================== --- cfe/trunk/test/Modules/ExtDebugInfo.cpp (original) +++ cfe/trunk/test/Modules/ExtDebugInfo.cpp Thu Apr 25 13:05:47 2019 @@ -214,7 +214,7 @@ void foo() { // CHECK-PCH: dwoId: 18446744073709551614 // CHECK: !DICompositeType(tag: DW_TAG_class_type, name: "A", -// CHECK-SAME: DIFlagFwdDecl, identifier: "_ZTS1A") +// CHECK-SAME: DIFlagFwdDecl) // There is a full definition of the type available in the module. // CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "Virtual", Modified: cfe/trunk/test/Modules/ModuleDebugInfo.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/ModuleDebugInfo.cpp?rev=359235&r1=359234&r2=359235&view=diff ============================================================================== --- cfe/trunk/test/Modules/ModuleDebugInfo.cpp (original) +++ cfe/trunk/test/Modules/ModuleDebugInfo.cpp Thu Apr 25 13:05:47 2019 @@ -119,8 +119,7 @@ // CHECK: ![[A:.*]] = {{.*}}!DICompositeType(tag: DW_TAG_class_type, name: "A", // CHECK-SAME: elements: -// CHECK-SAME: vtableHolder: ![[A]], -// CHECK-SAME: identifier: "_ZTS1A") +// CHECK-SAME: vtableHolder: ![[A]]) // CHECK: ![[DERIVED:.*]] = {{.*}}!DICompositeType(tag: DW_TAG_class_type, name: "Derived", // CHECK-SAME: identifier: "_ZTS7Derived") _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits