Revert "Mangle the IsSystem bit into the .pcm file name"
While I investigate some possible problems with this patch.
This reverts commit r228966
llvm-svn: 229910
diff --git a/clang/lib/Lex/HeaderSearch.cpp b/clang/lib/Lex/HeaderSearch.cpp
index f76d851..d6b255f 100644
--- a/clang/lib/Lex/HeaderSearch.cpp
+++ b/clang/lib/Lex/HeaderSearch.cpp
@@ -115,13 +115,11 @@
std::string HeaderSearch::getModuleFileName(Module *Module) {
const FileEntry *ModuleMap =
getModuleMap().getModuleMapFileForUniquing(Module);
- return getModuleFileName(Module->Name, ModuleMap->getName(),
- Module->IsSystem);
+ return getModuleFileName(Module->Name, ModuleMap->getName());
}
std::string HeaderSearch::getModuleFileName(StringRef ModuleName,
- StringRef ModuleMapPath,
- bool IsSystem) {
+ StringRef ModuleMapPath) {
// If we don't have a module cache path, we can't do anything.
if (ModuleCachePath.empty())
return std::string();
@@ -149,10 +147,6 @@
llvm::hash_code Hash =
llvm::hash_combine(DirName.lower(), FileName.lower());
- // Hash the IsSystem bit, since changing search paths can change whether a
- // module is considered 'system' or not.
- Hash = llvm::hash_combine(Hash, IsSystem);
-
SmallString<128> HashStr;
llvm::APInt(64, size_t(Hash)).toStringUnsigned(HashStr, /*Radix*/36);
llvm::sys::path::append(Result, ModuleName + "-" + HashStr.str() + ".pcm");