<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><br class=""><div><blockquote type="cite" class=""><div class="">On Sep 18, 2015, at 5:11 PM, David Blaikie <<a href="mailto:dblaikie@gmail.com" class="">dblaikie@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class=""><br class=""><div class="gmail_extra"><br class=""><div class="gmail_quote">On Fri, Sep 18, 2015 at 4:01 PM, Adrian Prantl via cfe-commits <span dir="ltr" class=""><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank" class="">cfe-commits@lists.llvm.org</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: adrian<br class="">
Date: Fri Sep 18 18:01:45 2015<br class="">
New Revision: 248062<br class="">
<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=248062&view=rev" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project?rev=248062&view=rev</a><br class="">
Log:<br class="">
CGDebugInfo: Make creating a skeleton CU in getOrCreateModuleRef optional.<br class="">
We don't want a skeleton CU when generating debug info for the module<br class="">
itself.<br class="">
<br class="">
NFC.<br class="">
<br class="">
Modified:<br class="">
cfe/trunk/lib/CodeGen/CGDebugInfo.cpp<br class="">
cfe/trunk/lib/CodeGen/CGDebugInfo.h<br class="">
<br class="">
Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=248062&r1=248061&r2=248062&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=248062&r1=248061&r2=248062&view=diff</a><br class="">
==============================================================================<br class="">
--- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original)<br class="">
+++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Fri Sep 18 18:01:45 2015<br class="">
@@ -1673,7 +1673,8 @@ llvm::DIType *CGDebugInfo::CreateType(co<br class="">
}<br class="">
<br class="">
llvm::DIModule *<br class="">
-CGDebugInfo::getOrCreateModuleRef(ExternalASTSource::ASTSourceDescriptor Mod) {<br class="">
+CGDebugInfo::getOrCreateModuleRef(ExternalASTSource::ASTSourceDescriptor Mod,<br class="">
+ bool CreateSkeletonCU) {<br class="">
auto &ModRef = ModuleRefCache[Mod.ModuleName];<br class="">
if (ModRef)<br class="">
return cast<llvm::DIModule>(ModRef);<br class="">
@@ -1700,15 +1701,20 @@ CGDebugInfo::getOrCreateModuleRef(Extern<br class="">
OS << '\"';<br class="">
}<br class="">
}<br class="">
- llvm::DIBuilder DIB(CGM.getModule());<br class="">
- auto *CU = DIB.createCompileUnit(TheCU->getSourceLanguage(), Mod.ModuleName,<br class="">
- Mod.Path, TheCU->getProducer(), true,<br class="">
- StringRef(), 0, Mod.ASTFile,<br class="">
- llvm::DIBuilder::FullDebug, Mod.Signature);<br class="">
- llvm::DIModule *M =<br class="">
- DIB.createModule(CU, Mod.ModuleName, ConfigMacros, Mod.Path,<br class="">
- CGM.getHeaderSearchOpts().Sysroot);<br class="">
- DIB.finalize();<br class="">
+<br class="">
+ llvm::DIModule *M = nullptr;<br class="">
+ if (CreateSkeletonCU) {<br class="">
+ llvm::DIBuilder DIB(CGM.getModule());<br class="">
+ auto *CU = DIB.createCompileUnit(TheCU->getSourceLanguage(), Mod.ModuleName,<br class="">
+ Mod.Path, TheCU->getProducer(), true,<br class="">
+ StringRef(), 0, Mod.ASTFile,<br class="">
+ llvm::DIBuilder::FullDebug, Mod.Signature);<br class="">
+ M = DIB.createModule(CU, Mod.ModuleName, ConfigMacros, Mod.Path,<br class="">
+ CGM.getHeaderSearchOpts().Sysroot);<br class=""></blockquote><div class=""><br class=""></div><div class="">Could you remind me why we have a module in the skeleton CU?</div></div></div></div></div></blockquote><div><br class=""></div><div>Note that this does not emit the module *in* the skeleton CU it just creates a skeleton CU alongside the module. The fact that it is mentioned as scope of the module here is misleading (and I should changed that to TheCU for clarity), DIBuilder ignores any DICompileUnits that are passed in as parent scopes.</div><div><br class=""></div><div>-- adrian</div><div class=""><br class=""></div><blockquote type="cite" class=""><div class=""><div dir="ltr" class=""><div class="gmail_extra"><div class="gmail_quote"><div class=""> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ DIB.finalize();<br class="">
+ } else<br class="">
+ M = DBuilder.createModule(TheCU, Mod.ModuleName, ConfigMacros, Mod.Path,<br class="">
+ CGM.getHeaderSearchOpts().Sysroot);<br class="">
ModRef.reset(M);<br class="">
return M;<br class="">
}<br class="">
@@ -2158,12 +2164,13 @@ llvm::DIModule *CGDebugInfo::getParentMo<br class="">
if (!DebugTypeExtRefs || !D->isFromASTFile())<br class="">
return nullptr;<br class="">
<br class="">
+ // Record a reference to an imported clang module or precompiled header.<br class="">
llvm::DIModule *ModuleRef = nullptr;<br class="">
auto *Reader = CGM.getContext().getExternalSource();<br class="">
auto Idx = D->getOwningModuleID();<br class="">
auto Info = Reader->getSourceDescriptor(Idx);<br class="">
if (Info)<br class="">
- ModuleRef = getOrCreateModuleRef(*Info);<br class="">
+ ModuleRef = getOrCreateModuleRef(*Info, true);<br class="">
return ModuleRef;<br class="">
}<br class="">
<br class="">
@@ -3387,9 +3394,9 @@ void CGDebugInfo::EmitImportDecl(const I<br class="">
auto *Reader = CGM.getContext().getExternalSource();<br class="">
auto Info = Reader->getSourceDescriptor(*ID.getImportedModule());<br class="">
DBuilder.createImportedDeclaration(<br class="">
- getCurrentContextDescriptor(cast<Decl>(ID.getDeclContext())),<br class="">
- getOrCreateModuleRef(Info),<br class="">
- getLineNumber(ID.getLocation()));<br class="">
+ getCurrentContextDescriptor(cast<Decl>(ID.getDeclContext())),<br class="">
+ getOrCreateModuleRef(Info, DebugTypeExtRefs),<br class="">
+ getLineNumber(ID.getLocation()));<br class="">
}<br class="">
<br class="">
llvm::DIImportedEntity *<br class="">
<br class="">
Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.h<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.h?rev=248062&r1=248061&r2=248062&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.h?rev=248062&r1=248061&r2=248062&view=diff</a><br class="">
==============================================================================<br class="">
--- cfe/trunk/lib/CodeGen/CGDebugInfo.h (original)<br class="">
+++ cfe/trunk/lib/CodeGen/CGDebugInfo.h Fri Sep 18 18:01:45 2015<br class="">
@@ -403,9 +403,11 @@ private:<br class="">
/// Get the type from the cache or create a new type if necessary.<br class="">
llvm::DIType *getOrCreateType(QualType Ty, llvm::DIFile *Fg);<br class="">
<br class="">
- /// Get a reference to a clang module.<br class="">
+ /// Get a reference to a clang module. If \p CreateSkeletonCU is true,<br class="">
+ /// this also creates a split dwarf skeleton compile unit.<br class="">
llvm::DIModule *<br class="">
- getOrCreateModuleRef(ExternalASTSource::ASTSourceDescriptor Mod);<br class="">
+ getOrCreateModuleRef(ExternalASTSource::ASTSourceDescriptor Mod,<br class="">
+ bool CreateSkeletonCU);<br class="">
<br class="">
/// DebugTypeExtRefs: If \p D originated in a clang module, return it.<br class="">
llvm::DIModule *getParentModuleOrNull(const Decl *D);<br class="">
<br class="">
<br class="">
_______________________________________________<br class="">
cfe-commits mailing list<br class="">
<a href="mailto:cfe-commits@lists.llvm.org" class="">cfe-commits@lists.llvm.org</a><br class="">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank" class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br class="">
</blockquote></div><br class=""></div></div>
</div></blockquote></div><br class=""></body></html>