<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Sep 18, 2015 at 4:01 PM, 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: Fri Sep 18 18:01:45 2015<br>
New Revision: 248062<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=248062&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=248062&view=rev</a><br>
Log:<br>
CGDebugInfo: Make creating a skeleton CU in getOrCreateModuleRef optional.<br>
We don't want a skeleton CU when generating debug info for the module<br>
itself.<br>
<br>
NFC.<br>
<br>
Modified:<br>
cfe/trunk/lib/CodeGen/CGDebugInfo.cpp<br>
cfe/trunk/lib/CodeGen/CGDebugInfo.h<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp<br>
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">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=248062&r1=248061&r2=248062&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Fri Sep 18 18:01:45 2015<br>
@@ -1673,7 +1673,8 @@ llvm::DIType *CGDebugInfo::CreateType(co<br>
}<br>
<br>
llvm::DIModule *<br>
-CGDebugInfo::getOrCreateModuleRef(ExternalASTSource::ASTSourceDescriptor Mod) {<br>
+CGDebugInfo::getOrCreateModuleRef(ExternalASTSource::ASTSourceDescriptor Mod,<br>
+ bool CreateSkeletonCU) {<br>
auto &ModRef = ModuleRefCache[Mod.ModuleName];<br>
if (ModRef)<br>
return cast<llvm::DIModule>(ModRef);<br>
@@ -1700,15 +1701,20 @@ CGDebugInfo::getOrCreateModuleRef(Extern<br>
OS << '\"';<br>
}<br>
}<br>
- llvm::DIBuilder DIB(CGM.getModule());<br>
- auto *CU = DIB.createCompileUnit(TheCU->getSourceLanguage(), Mod.ModuleName,<br>
- Mod.Path, TheCU->getProducer(), true,<br>
- StringRef(), 0, Mod.ASTFile,<br>
- llvm::DIBuilder::FullDebug, Mod.Signature);<br>
- llvm::DIModule *M =<br>
- DIB.createModule(CU, Mod.ModuleName, ConfigMacros, Mod.Path,<br>
- CGM.getHeaderSearchOpts().Sysroot);<br>
- DIB.finalize();<br>
+<br>
+ llvm::DIModule *M = nullptr;<br>
+ if (CreateSkeletonCU) {<br>
+ llvm::DIBuilder DIB(CGM.getModule());<br>
+ auto *CU = DIB.createCompileUnit(TheCU->getSourceLanguage(), Mod.ModuleName,<br>
+ Mod.Path, TheCU->getProducer(), true,<br>
+ StringRef(), 0, Mod.ASTFile,<br>
+ llvm::DIBuilder::FullDebug, Mod.Signature);<br>
+ M = DIB.createModule(CU, Mod.ModuleName, ConfigMacros, Mod.Path,<br>
+ CGM.getHeaderSearchOpts().Sysroot);<br></blockquote><div><br></div><div>Could you remind me why we have a module in the skeleton CU?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ DIB.finalize();<br>
+ } else<br>
+ M = DBuilder.createModule(TheCU, Mod.ModuleName, ConfigMacros, Mod.Path,<br>
+ CGM.getHeaderSearchOpts().Sysroot);<br>
ModRef.reset(M);<br>
return M;<br>
}<br>
@@ -2158,12 +2164,13 @@ llvm::DIModule *CGDebugInfo::getParentMo<br>
if (!DebugTypeExtRefs || !D->isFromASTFile())<br>
return nullptr;<br>
<br>
+ // Record a reference to an imported clang module or precompiled header.<br>
llvm::DIModule *ModuleRef = nullptr;<br>
auto *Reader = CGM.getContext().getExternalSource();<br>
auto Idx = D->getOwningModuleID();<br>
auto Info = Reader->getSourceDescriptor(Idx);<br>
if (Info)<br>
- ModuleRef = getOrCreateModuleRef(*Info);<br>
+ ModuleRef = getOrCreateModuleRef(*Info, true);<br>
return ModuleRef;<br>
}<br>
<br>
@@ -3387,9 +3394,9 @@ void CGDebugInfo::EmitImportDecl(const I<br>
auto *Reader = CGM.getContext().getExternalSource();<br>
auto Info = Reader->getSourceDescriptor(*ID.getImportedModule());<br>
DBuilder.createImportedDeclaration(<br>
- getCurrentContextDescriptor(cast<Decl>(ID.getDeclContext())),<br>
- getOrCreateModuleRef(Info),<br>
- getLineNumber(ID.getLocation()));<br>
+ getCurrentContextDescriptor(cast<Decl>(ID.getDeclContext())),<br>
+ getOrCreateModuleRef(Info, DebugTypeExtRefs),<br>
+ getLineNumber(ID.getLocation()));<br>
}<br>
<br>
llvm::DIImportedEntity *<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.h<br>
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">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.h?rev=248062&r1=248061&r2=248062&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CGDebugInfo.h (original)<br>
+++ cfe/trunk/lib/CodeGen/CGDebugInfo.h Fri Sep 18 18:01:45 2015<br>
@@ -403,9 +403,11 @@ private:<br>
/// Get the type from the cache or create a new type if necessary.<br>
llvm::DIType *getOrCreateType(QualType Ty, llvm::DIFile *Fg);<br>
<br>
- /// Get a reference to a clang module.<br>
+ /// Get a reference to a clang module. If \p CreateSkeletonCU is true,<br>
+ /// this also creates a split dwarf skeleton compile unit.<br>
llvm::DIModule *<br>
- getOrCreateModuleRef(ExternalASTSource::ASTSourceDescriptor Mod);<br>
+ getOrCreateModuleRef(ExternalASTSource::ASTSourceDescriptor Mod,<br>
+ bool CreateSkeletonCU);<br>
<br>
/// DebugTypeExtRefs: If \p D originated in a clang module, return it.<br>
llvm::DIModule *getParentModuleOrNull(const Decl *D);<br>
<br>
<br>
_______________________________________________<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/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>