diff options
| -rw-r--r-- | clang/lib/CodeGen/CGDebugInfo.cpp | 3 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/debug-info-codeview-injected-class.cpp | 21 |
2 files changed, 24 insertions, 0 deletions
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index b99b519a966..d6cb798c475 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -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); diff --git a/clang/test/CodeGenCXX/debug-info-codeview-injected-class.cpp b/clang/test/CodeGenCXX/debug-info-codeview-injected-class.cpp new file mode 100644 index 00000000000..b421b2bf8bd --- /dev/null +++ b/clang/test/CodeGenCXX/debug-info-codeview-injected-class.cpp @@ -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", |
