<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jan 22, 2016 at 9:43 AM, 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 Jan 22 11:43:43 2016<br>
New Revision: 258507<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=258507&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=258507&view=rev</a><br>
Log:<br>
Module Debugging: Use a nonzero DWO id for precompiled headers.<br>
PCH files don't have a module signature and LLVM uses a nonzero DWO id as<br>
an indicator for skeleton / module CUs. This change pins the DWO id for PCH<br>
files to a known constant value.<br>
The correct long-term solution here is to implement a module signature<br>
that is an actual dterministic hash (at the moment module signatures are<br>
just random nonzero numbers) and then enable this for PCH files as well.<br></blockquote><div><br></div><div>^ is this on the books/planned at all?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
<rdar://problem/24290667><br>
<br>
Modified:<br>
cfe/trunk/lib/CodeGen/CGDebugInfo.cpp<br>
cfe/trunk/lib/CodeGen/ObjectFilePCHContainerOperations.cpp<br>
cfe/trunk/test/Modules/ExtDebugInfo.cpp<br>
cfe/trunk/test/Modules/ModuleDebugInfo.cpp<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=258507&r1=258506&r2=258507&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=258507&r1=258506&r2=258507&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Fri Jan 22 11:43:43 2016<br>
@@ -1740,11 +1740,14 @@ CGDebugInfo::getOrCreateModuleRef(Extern<br>
<br>
bool IsRootModule = M ? !M->Parent : true;<br>
if (CreateSkeletonCU && IsRootModule) {<br>
+ // PCH files don't have a signature field in the control block,<br>
+ // but LLVM detects skeleton CUs by looking for a non-zero DWO id.<br>
+ uint64_t Signature = Mod.getSignature() ? Mod.getSignature() : ~1U;<br>
llvm::DIBuilder DIB(CGM.getModule());<br>
DIB.createCompileUnit(TheCU->getSourceLanguage(), Mod.getModuleName(),<br>
Mod.getPath(), TheCU->getProducer(), true,<br>
StringRef(), 0, Mod.getASTFile(),<br>
- llvm::DIBuilder::FullDebug, Mod.getSignature());<br>
+ llvm::DIBuilder::FullDebug, Signature);<br>
DIB.finalize();<br>
}<br>
llvm::DIModule *Parent =<br>
<br>
Modified: cfe/trunk/lib/CodeGen/ObjectFilePCHContainerOperations.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/ObjectFilePCHContainerOperations.cpp?rev=258507&r1=258506&r2=258507&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/ObjectFilePCHContainerOperations.cpp?rev=258507&r1=258506&r2=258507&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/ObjectFilePCHContainerOperations.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/ObjectFilePCHContainerOperations.cpp Fri Jan 22 11:43:43 2016<br>
@@ -219,7 +219,11 @@ public:<br>
<br>
M->setTargetTriple(Ctx.getTargetInfo().getTriple().getTriple());<br>
M->setDataLayout(Ctx.getTargetInfo().getDataLayoutString());<br>
- Builder->getModuleDebugInfo()->setDwoId(Buffer->Signature);<br>
+<br>
+ // PCH files don't have a signature field in the control block,<br>
+ // but LLVM detects DWO CUs by looking for a non-zero DWO id.<br>
+ uint64_t Signature = Buffer->Signature ? Buffer->Signature : ~1U;<br>
+ Builder->getModuleDebugInfo()->setDwoId(Signature);<br>
<br>
// Finalize the Builder.<br>
if (Builder)<br>
<br>
Modified: cfe/trunk/test/Modules/ExtDebugInfo.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/ExtDebugInfo.cpp?rev=258507&r1=258506&r2=258507&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/ExtDebugInfo.cpp?rev=258507&r1=258506&r2=258507&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Modules/ExtDebugInfo.cpp (original)<br>
+++ cfe/trunk/test/Modules/ExtDebugInfo.cpp Fri Jan 22 11:43:43 2016<br>
@@ -102,3 +102,7 @@ void foo() {<br>
<br>
<br>
// CHECK: !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !0, entity: !"_ZTSN8DebugCXX6StructE", line: 24)<br>
+<br>
+// CHECK: !DICompileUnit(<br>
+// CHECK-SAME: splitDebugFilename:<br>
+// CHECK-SAME: dwoId:<br>
<br>
Modified: cfe/trunk/test/Modules/ModuleDebugInfo.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/ModuleDebugInfo.cpp?rev=258507&r1=258506&r2=258507&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/ModuleDebugInfo.cpp?rev=258507&r1=258506&r2=258507&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Modules/ModuleDebugInfo.cpp (original)<br>
+++ cfe/trunk/test/Modules/ModuleDebugInfo.cpp Fri Jan 22 11:43:43 2016<br>
@@ -8,7 +8,6 @@<br>
// RUN: %clang_cc1 -triple %itanium_abi_triple -x objective-c++ -std=c++11 -debug-info-kind=limited -fmodules -fmodule-format=obj -fimplicit-module-maps -DMODULES -fmodules-cache-path=%t %s -I %S/Inputs -I %t -emit-llvm -o %t.ll -mllvm -debug-only=pchcontainer &>%t-mod.ll<br>
// RUN: cat %t-mod.ll | FileCheck %s<br>
// RUN: cat %t-mod.ll | FileCheck --check-prefix=CHECK-NEG %s<br>
-// RUN: cat %t-mod.ll | FileCheck --check-prefix=CHECK-DWO %s<br>
<br>
// PCH:<br>
// RUN: %clang_cc1 -triple %itanium_abi_triple -x c++ -std=c++11 -emit-pch -fmodule-format=obj -I %S/Inputs -o %t.pch %S/Inputs/DebugCXX.h -mllvm -debug-only=pchcontainer &>%t-pch.ll<br>
@@ -22,7 +21,7 @@<br>
// CHECK: distinct !DICompileUnit(language: DW_LANG_{{.*}}C_plus_plus,<br>
// CHECK-SAME: isOptimized: false,<br>
// CHECK-SAME-NOT: splitDebugFilename:<br>
-// CHECK-DWO: dwoId:<br>
+// CHECK: dwoId:<br>
<br>
// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "Enum"<br>
// CHECK-SAME: identifier: "_ZTSN8DebugCXX4EnumE")<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>