summaryrefslogtreecommitdiffstats
path: root/clang/lib/Serialization/ASTReader.cpp
diff options
context:
space:
mode:
authorAdrian Prantl <aprantl@apple.com>2016-01-22 23:30:56 +0000
committerAdrian Prantl <aprantl@apple.com>2016-01-22 23:30:56 +0000
commit3a2d4947a69ff4731d2adb9862552fc8a003d295 (patch)
tree595c8728ff691c26a0628692f617168cd600af3c /clang/lib/Serialization/ASTReader.cpp
parent841e5a03982111d06bbd7555dde162b839e9ec18 (diff)
downloadbcm5719-llvm-3a2d4947a69ff4731d2adb9862552fc8a003d295.tar.gz
bcm5719-llvm-3a2d4947a69ff4731d2adb9862552fc8a003d295.zip
Module Debugging: Canonicalize the file names used as PCH module names
by stripping the path. Follow-up to r258555. This is safe because only one PCH per CU is currently supported for module debugging. rdar://problem/24301262 llvm-svn: 258582
Diffstat (limited to 'clang/lib/Serialization/ASTReader.cpp')
-rw-r--r--clang/lib/Serialization/ASTReader.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index 833ff57e4d0..97fbb45e121 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -7581,8 +7581,9 @@ ASTReader::getSourceDescriptor(unsigned ID) {
// Chained PCH are not suported.
if (ModuleMgr.size() == 1) {
ModuleFile &MF = ModuleMgr.getPrimaryModule();
- return ASTReader::ASTSourceDescriptor(
- MF.OriginalSourceFileName, MF.OriginalDir, MF.FileName, MF.Signature);
+ StringRef ModuleName = llvm::sys::path::filename(MF.OriginalSourceFileName);
+ return ASTReader::ASTSourceDescriptor(ModuleName, MF.OriginalDir,
+ MF.FileName, MF.Signature);
}
return None;
}
OpenPOWER on IntegriCloud