From 755220bcefcf90ebbcc54f03392a809d84d64146 Mon Sep 17 00:00:00 2001
From: Reid Kleckner <rnk@google.com>
Date: Mon, 1 Aug 2016 18:56:13 +0000
Subject: [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
---
 clang/lib/CodeGen/CGDebugInfo.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'clang/lib/CodeGen/CGDebugInfo.cpp')

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);
-- 
cgit v1.2.3