<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On 11 May 2017 at 15:59, Adrian Prantl via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: adrian<br>
Date: Thu May 11 17:59:19 2017<br>
New Revision: 302840<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=302840&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=302840&view=rev</a><br>
Log:<br>
Module Debug Info: Emit namespaced C++ forward decls in the correct module.<br>
<br>
The AST merges NamespaceDecls, but for module debug info it is<br>
important to put a namespace decl (or rather its children) into the<br>
correct (sub-)module, so we need to use the parent module of the decl<br>
that triggered this namespace to be serialized as a second key when<br>
looking up DINamespace nodes.<br></blockquote><div><br></div><div>I don't think that's quite right; the AST doesn't merge NamespaceDecls. It looks like the issue is that we're mapping to the semantic DeclContext (which will be the canonical declaration of the namespace and could be from a different module) rather than the lexical DeclContext (the enclosing one, in the same module)... and then getOrCreateNameSpace is again mapping to the canonical declaration before calling getDeclContextDescriptor.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
rdar://problem/29339538<br>
<br>
Added:<br>
cfe/trunk/test/Modules/<wbr>DebugInfoNamespace.cpp<br>
cfe/trunk/test/Modules/Inputs/<wbr>DebugInfoNamespace/<br>
cfe/trunk/test/Modules/Inputs/<wbr>DebugInfoNamespace/A.h<br>
cfe/trunk/test/Modules/Inputs/<wbr>DebugInfoNamespace/B.h<br>
cfe/trunk/test/Modules/Inputs/<wbr>DebugInfoNamespace/module.<wbr>modulemap<br>
Modified:<br>
cfe/trunk/lib/CodeGen/<wbr>CGDebugInfo.cpp<br>
cfe/trunk/lib/CodeGen/<wbr>CGDebugInfo.h<br>
<br>
Modified: cfe/trunk/lib/CodeGen/<wbr>CGDebugInfo.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=302840&r1=302839&r2=302840&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/CodeGen/<wbr>CGDebugInfo.cpp?rev=302840&r1=<wbr>302839&r2=302840&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/CodeGen/<wbr>CGDebugInfo.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/<wbr>CGDebugInfo.cpp Thu May 11 17:59:19 2017<br>
@@ -208,8 +208,10 @@ llvm::DIScope *CGDebugInfo::getContextDe<br>
}<br>
<br>
// Check namespace.<br>
- if (const auto *NSDecl = dyn_cast<NamespaceDecl>(<wbr>Context))<br>
- return getOrCreateNameSpace(NSDecl);<br>
+ if (const auto *NSDecl = dyn_cast<NamespaceDecl>(<wbr>Context)) {<br>
+ auto *ParentModule = dyn_cast<llvm::DIModule>(<wbr>Default);<br>
+ return getOrCreateNamespace(NSDecl, ParentModule);<br>
+ }<br>
<br>
if (const auto *RDecl = dyn_cast<RecordDecl>(Context))<br>
if (!RDecl->isDependentType())<br>
@@ -2861,7 +2863,7 @@ void CGDebugInfo::<wbr>collectFunctionDeclPro<br>
if (DebugKind >= codegenoptions::<wbr>LimitedDebugInfo) {<br>
if (const NamespaceDecl *NSDecl =<br>
dyn_cast_or_null<<wbr>NamespaceDecl>(FD-><wbr>getDeclContext()))<br>
- FDContext = getOrCreateNameSpace(NSDecl);<br>
+ FDContext = getOrCreateNamespace(NSDecl, getParentModuleOrNull(FD));<br>
else if (const RecordDecl *RDecl =<br>
dyn_cast_or_null<RecordDecl>(<wbr>FD->getDeclContext())) {<br>
llvm::DIScope *Mod = getParentModuleOrNull(RDecl);<br>
@@ -3961,7 +3963,7 @@ void CGDebugInfo::<wbr>EmitUsingDirective(con<br>
CGM.getCodeGenOpts().<wbr>DebugExplicitImport) {<br>
DBuilder.createImportedModule(<br>
getCurrentContextDescriptor(<wbr>cast<Decl>(UD.getDeclContext()<wbr>)),<br>
- getOrCreateNameSpace(NSDecl),<br>
+ getOrCreateNamespace(NSDecl, getParentModuleOrNull(&UD)),<br>
getLineNumber(UD.getLocation()<wbr>));<br>
}<br>
}<br>
@@ -4021,23 +4023,32 @@ CGDebugInfo::<wbr>EmitNamespaceAlias(const Na<br>
else<br>
R = DBuilder.<wbr>createImportedDeclaration(<br>
getCurrentContextDescriptor(<wbr>cast<Decl>(NA.getDeclContext()<wbr>)),<br>
- getOrCreateNameSpace(cast<<wbr>NamespaceDecl>(NA.<wbr>getAliasedNamespace())),<br>
+ getOrCreateNamespace(cast<<wbr>NamespaceDecl>(NA.<wbr>getAliasedNamespace()),<br>
+ getParentModuleOrNull(&NA)),<br>
getLineNumber(NA.getLocation()<wbr>), NA.getName());<br>
VH.reset(R);<br>
return R;<br>
}<br>
<br>
llvm::DINamespace *<br>
-CGDebugInfo::<wbr>getOrCreateNameSpace(const NamespaceDecl *NSDecl) {<br>
+CGDebugInfo::<wbr>getOrCreateNamespace(const NamespaceDecl *NSDecl,<br>
+ llvm::DIModule *ParentModule) {<br>
NSDecl = NSDecl->getCanonicalDecl();<br>
- auto I = NameSpaceCache.find(NSDecl);<br>
- if (I != NameSpaceCache.end())<br>
+ // The AST merges NamespaceDecls, but for module debug info it is important to<br>
+ // put a namespace decl (or rather its children) into the correct<br>
+ // (sub-)module, so use the parent module of the decl that triggered this<br>
+ // namespace to be serialized as a second key.<br>
+ NamespaceKey Key = {NSDecl, ParentModule};<br>
+ auto I = NamespaceCache.find(Key);<br>
+ if (I != NamespaceCache.end())<br>
return cast<llvm::DINamespace>(I-><wbr>second);<br>
<br>
llvm::DIScope *Context = getDeclContextDescriptor(<wbr>NSDecl);<br>
- llvm::DINamespace *NS =<br>
- DBuilder.createNameSpace(<wbr>Context, NSDecl->getName(), NSDecl->isInline());<br>
- NameSpaceCache[NSDecl].reset(<wbr>NS);<br>
+ // Don't trust the context if it is a DIModule (see comment above).<br>
+ llvm::DINamespace *NS = DBuilder.createNameSpace(<br>
+ isa<llvm::DIModule>(Context) ? ParentModule : Context, NSDecl->getName(),<br>
+ NSDecl->isInline());<br>
+ NamespaceCache[Key].reset(NS);<br>
return NS;<br>
}<br>
<br>
<br>
Modified: cfe/trunk/lib/CodeGen/<wbr>CGDebugInfo.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.h?rev=302840&r1=302839&r2=302840&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/CodeGen/<wbr>CGDebugInfo.h?rev=302840&r1=<wbr>302839&r2=302840&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/CodeGen/<wbr>CGDebugInfo.h (original)<br>
+++ cfe/trunk/lib/CodeGen/<wbr>CGDebugInfo.h Thu May 11 17:59:19 2017<br>
@@ -125,7 +125,8 @@ class CGDebugInfo {<br>
/// Cache declarations relevant to DW_TAG_imported_declarations (C++<br>
/// using declarations) that aren't covered by other more specific caches.<br>
llvm::DenseMap<const Decl *, llvm::TrackingMDRef> DeclCache;<br>
- llvm::DenseMap<const NamespaceDecl *, llvm::TrackingMDRef> NameSpaceCache;<br>
+ typedef std::pair<const NamespaceDecl *, const llvm::DIModule *> NamespaceKey;<br>
+ llvm::DenseMap<NamespaceKey, llvm::TrackingMDRef> NamespaceCache;<br>
llvm::DenseMap<const NamespaceAliasDecl *, llvm::TrackingMDRef><br>
NamespaceAliasCache;<br>
llvm::DenseMap<const Decl *, llvm::TypedTrackingMDRef<llvm:<wbr>:DIDerivedType>><br>
@@ -194,8 +195,15 @@ class CGDebugInfo {<br>
getOrCreateFunctionType(const Decl *D, QualType FnType, llvm::DIFile *F);<br>
/// \return debug info descriptor for vtable.<br>
llvm::DIType *getOrCreateVTablePtrType(<wbr>llvm::DIFile *F);<br>
+<br>
+ /// \return namespace descriptor for the given namespace decl.<br>
+ ///<br>
/// \return namespace descriptor for the given namespace decl.<br>
- llvm::DINamespace *getOrCreateNameSpace(const NamespaceDecl *N);<br>
+ /// \param ParentModule The parent module (or nullptr) of this particular<br>
+ /// namespace decl. This needs to be passed in because<br>
+ /// the AST merges namespace decls.<br>
+ llvm::DINamespace *getOrCreateNamespace(const NamespaceDecl *N,<br>
+ llvm::DIModule *ParentModule);<br>
llvm::DIType *CreatePointerLikeType(llvm::<wbr>dwarf::Tag Tag, const Type *Ty,<br>
QualType PointeeTy, llvm::DIFile *F);<br>
llvm::DIType *getOrCreateStructPtrType(<wbr>StringRef Name, llvm::DIType *&Cache);<br>
<br>
Added: cfe/trunk/test/Modules/<wbr>DebugInfoNamespace.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/DebugInfoNamespace.cpp?rev=302840&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/<wbr>Modules/DebugInfoNamespace.<wbr>cpp?rev=302840&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Modules/<wbr>DebugInfoNamespace.cpp (added)<br>
+++ cfe/trunk/test/Modules/<wbr>DebugInfoNamespace.cpp Thu May 11 17:59:19 2017<br>
@@ -0,0 +1,19 @@<br>
+// RUN: rm -rf %t<br>
+// RUN: %clang_cc1 -x objective-c++ -std=c++11 -debug-info-kind=standalone \<br>
+// RUN: -dwarf-ext-refs -fmodules \<br>
+// RUN: -fmodule-format=obj -fimplicit-module-maps \<br>
+// RUN: -triple %itanium_abi_triple -fmodules-cache-path=%t \<br>
+// RUN: %s -I %S/Inputs/DebugInfoNamespace -I %t -emit-llvm -o - \<br>
+// RUN: | FileCheck %s<br>
+<br>
+#include "A.h"<br>
+#include "B.h"<br>
+using namespace N;<br>
+B b;<br>
+<br>
+// Verify that the forward decl of B is in module B.<br>
+//<br>
+// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "B",<br>
+// CHECK-SAME: scope: ![[N:[0-9]+]]<br>
+// CHECK: ![[N]] = !DINamespace(name: "N", scope: ![[B:[0-9]+]])<br>
+// CHECK: ![[B]] = !DIModule(scope: null, name: "B",<br>
<br>
Added: cfe/trunk/test/Modules/Inputs/<wbr>DebugInfoNamespace/A.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/DebugInfoNamespace/A.h?rev=302840&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/<wbr>Modules/Inputs/<wbr>DebugInfoNamespace/A.h?rev=<wbr>302840&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Modules/Inputs/<wbr>DebugInfoNamespace/A.h (added)<br>
+++ cfe/trunk/test/Modules/Inputs/<wbr>DebugInfoNamespace/A.h Thu May 11 17:59:19 2017<br>
@@ -0,0 +1,3 @@<br>
+namespace N {<br>
+ struct A {};<br>
+}<br>
<br>
Added: cfe/trunk/test/Modules/Inputs/<wbr>DebugInfoNamespace/B.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/DebugInfoNamespace/B.h?rev=302840&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/<wbr>Modules/Inputs/<wbr>DebugInfoNamespace/B.h?rev=<wbr>302840&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Modules/Inputs/<wbr>DebugInfoNamespace/B.h (added)<br>
+++ cfe/trunk/test/Modules/Inputs/<wbr>DebugInfoNamespace/B.h Thu May 11 17:59:19 2017<br>
@@ -0,0 +1,3 @@<br>
+namespace N {<br>
+ struct B {};<br>
+}<br>
<br>
Added: cfe/trunk/test/Modules/Inputs/<wbr>DebugInfoNamespace/module.<wbr>modulemap<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/DebugInfoNamespace/module.modulemap?rev=302840&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/<wbr>Modules/Inputs/<wbr>DebugInfoNamespace/module.<wbr>modulemap?rev=302840&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Modules/Inputs/<wbr>DebugInfoNamespace/module.<wbr>modulemap (added)<br>
+++ cfe/trunk/test/Modules/Inputs/<wbr>DebugInfoNamespace/module.<wbr>modulemap Thu May 11 17:59:19 2017<br>
@@ -0,0 +1,8 @@<br>
+module A {<br>
+ header "A.h"<br>
+ export *<br>
+}<br>
+module B {<br>
+ header "B.h"<br>
+ export *<br>
+}<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>