diff options
| author | Adrian Prantl <aprantl@apple.com> | 2016-01-22 18:46:45 +0000 |
|---|---|---|
| committer | Adrian Prantl <aprantl@apple.com> | 2016-01-22 18:46:45 +0000 |
| commit | ae108c47043a93b0cb3c775ebe79588324c305d6 (patch) | |
| tree | 4446850aef9fc41c877486a1778c6e1a574aa4ba | |
| parent | e1c2ad8aa716a7af74d5a3cbaea1fe01d0a2d309 (diff) | |
| download | bcm5719-llvm-ae108c47043a93b0cb3c775ebe79588324c305d6.tar.gz bcm5719-llvm-ae108c47043a93b0cb3c775ebe79588324c305d6.zip | |
Fix a typo in r258507 and change the PCH dwoid constant to ~1UL.
rdar://problem/24290667
llvm-svn: 258519
| -rw-r--r-- | clang/lib/CodeGen/CGDebugInfo.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/CodeGen/ObjectFilePCHContainerOperations.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Modules/ExtDebugInfo.cpp | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index 4e0cc3f8574..635a2d06a24 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -1742,7 +1742,7 @@ CGDebugInfo::getOrCreateModuleRef(ExternalASTSource::ASTSourceDescriptor Mod, 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, diff --git a/clang/lib/CodeGen/ObjectFilePCHContainerOperations.cpp b/clang/lib/CodeGen/ObjectFilePCHContainerOperations.cpp index 2178ec21c7a..f20489275b2 100644 --- a/clang/lib/CodeGen/ObjectFilePCHContainerOperations.cpp +++ b/clang/lib/CodeGen/ObjectFilePCHContainerOperations.cpp @@ -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. diff --git a/clang/test/Modules/ExtDebugInfo.cpp b/clang/test/Modules/ExtDebugInfo.cpp index 189ebf016eb..dfc8be53d1f 100644 --- a/clang/test/Modules/ExtDebugInfo.cpp +++ b/clang/test/Modules/ExtDebugInfo.cpp @@ -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 |
