Author: rnk Date: Mon Aug 1 13:56:13 2016 New Revision: 277367 URL: http://llvm.org/viewvc/llvm-project?rev=277367&view=rev Log: [codeview] Skip injected class names in nested record emission
We were already trying to do this, but our check wasn't quite right. Fixes PR28790 Added: cfe/trunk/test/CodeGenCXX/debug-info-codeview-injected-class.cpp Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=277367&r1=277366&r2=277367&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original) +++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Mon Aug 1 13:56:13 2016 @@ -1092,6 +1092,9 @@ void CGDebugInfo::CollectRecordNormalFie void CGDebugInfo::CollectRecordNestedRecord( const RecordDecl *RD, SmallVectorImpl<llvm::Metadata *> &elements) { QualType Ty = CGM.getContext().getTypeDeclType(RD); + // Injected class names are not considered nested records. + if (isa<InjectedClassNameType>(Ty)) + return; SourceLocation Loc = RD->getLocation(); llvm::DIType *nestedType = getOrCreateType(Ty, getOrCreateFile(Loc)); elements.push_back(nestedType); Added: cfe/trunk/test/CodeGenCXX/debug-info-codeview-injected-class.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-codeview-injected-class.cpp?rev=277367&view=auto ============================================================================== --- cfe/trunk/test/CodeGenCXX/debug-info-codeview-injected-class.cpp (added) +++ cfe/trunk/test/CodeGenCXX/debug-info-codeview-injected-class.cpp Mon Aug 1 13:56:13 2016 @@ -0,0 +1,21 @@ +// RUN: %clang_cc1 %s -std=c++11 -triple=i686-pc-windows-msvc -debug-info-kind=limited -gcodeview -emit-llvm -o - | FileCheck %s + +// The injected class names in this test were accidentally making it into our +// nested class record debug info. Make sure they don't appear there. + +// PR28790 + +struct A { + const char *m_fn1(); + template <typename> class B; + template <typename> class C; + template <typename FunctionIdT> class C<B<FunctionIdT>>; +}; +const char *A::m_fn1() { return nullptr; } + +// CHECK: ![[A:[^ ]*]] = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "A", +// CHECK-SAME: elements: ![[elements:[0-9]+]] + +// CHECK: ![[elements]] = !{![[m_fn1:[0-9]+]]} + +// CHECK: ![[m_fn1]] = !DISubprogram(name: "m_fn1", _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits