maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[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

llvm-svn: 277367
This commit is contained in:
Reid Kleckner 2016-08-01 18:56:13 +00:00
parent 5f0e76dca6
commit 755220bcef
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/CodeGen/CGDebugInfo.cpp
View File

@ -1092,6 +1092,9 @@ void CGDebugInfo::CollectRecordNormalField(
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);

21
clang/test/CodeGenCXX/debug-info-codeview-injected-class.cpp Normal file
View File

@ -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",