Author: adrian
Date: Fri Jan 22 12:46:45 2016
New Revision: 258519
URL: http://llvm.org/viewvc/llvm-project?rev=258519&view=rev
Log:
Fix a typo in r258507 and change the PCH dwoid constant to ~1UL.
rdar://problem/24290667
Modified:
cfe/trunk/lib/CodeGen/CGDebugInfo.cpp
cfe/trunk/lib/CodeGen/ObjectFilePCHContainerOperations.cpp
cfe/trunk/test/Modules/ExtDebugInfo.cpp
Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=258519&r1=258518&r2=258519&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Fri Jan 22 12:46:45 2016
@@ -1742,7 +1742,7 @@ CGDebugInfo::getOrCreateModuleRef(Extern
if (CreateSkeletonCU && IsRootModule) {
// PCH files don't have a signature field in the control block,
// but LLVM detects skeleton CUs by looking for a non-zero DWO id.
- uint64_t Signature = Mod.getSignature() ? Mod.getSignature() : ~1U;
+ uint64_t Signature = Mod.getSignature() ? Mod.getSignature() : ~1UL;
llvm::DIBuilder DIB(CGM.getModule());
DIB.createCompileUnit(TheCU->getSourceLanguage(), Mod.getModuleName(),
Mod.getPath(), TheCU->getProducer(), true,
Modified: cfe/trunk/lib/CodeGen/ObjectFilePCHContainerOperations.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/ObjectFilePCHContainerOperations.cpp?rev=258519&r1=258518&r2=258519&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/ObjectFilePCHContainerOperations.cpp (original)
+++ cfe/trunk/lib/CodeGen/ObjectFilePCHContainerOperations.cpp Fri Jan 22
12:46:45 2016
@@ -222,7 +222,7 @@ public:
// PCH files don't have a signature field in the control block,
// but LLVM detects DWO CUs by looking for a non-zero DWO id.
- uint64_t Signature = Buffer->Signature ? Buffer->Signature : ~1U;
+ uint64_t Signature = Buffer->Signature ? Buffer->Signature : ~1UL;
Builder->getModuleDebugInfo()->setDwoId(Signature);
// Finalize the Builder.
Modified: cfe/trunk/test/Modules/ExtDebugInfo.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/ExtDebugInfo.cpp?rev=258519&r1=258518&r2=258519&view=diff
==============================================================================
--- cfe/trunk/test/Modules/ExtDebugInfo.cpp (original)
+++ cfe/trunk/test/Modules/ExtDebugInfo.cpp Fri Jan 22 12:46:45 2016
@@ -18,7 +18,7 @@
// RUN: -triple %itanium_abi_triple \
// RUN: -include-pch %t.pch %s -emit-llvm -o %t-pch.ll %s
// RUN: cat %t-pch.ll | FileCheck %s
-
+// RUN: cat %t-pch.ll | FileCheck %s --check-prefix=CHECK-PCH
#ifdef MODULES
@import DebugCXX;
@@ -109,3 +109,4 @@ void foo() {
// CHECK: !DICompileUnit(
// CHECK-SAME: splitDebugFilename:
// CHECK-SAME: dwoId:
+// CHECK-PCH: dwoId: 18446744073709551614
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
