For modules, use a hash of the compiler version, language options, and
target triple to separate modules built under different
conditions. The hash is used to create a subdirectory in the module
cache path where other invocations of the compiler (with the same
version, language options, etc.) can find the precompiled modules.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@139662 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp
index ece9cd8..720f7bb 100644
--- a/lib/Frontend/CompilerInstance.cpp
+++ b/lib/Frontend/CompilerInstance.cpp
@@ -221,6 +221,15 @@
InitializePreprocessor(*PP, PPOpts, getHeaderSearchOpts(), getFrontendOpts());
+ // Set up the module path, including the hash for the
+ // module-creation options.
+ llvm::SmallString<256> SpecificModuleCache(
+ getHeaderSearchOpts().ModuleCachePath);
+ if (!getHeaderSearchOpts().DisableModuleHash)
+ llvm::sys::path::append(SpecificModuleCache,
+ getInvocation().getModuleHash());
+ PP->getHeaderSearchInfo().setModuleCachePath(SpecificModuleCache);
+
// Handle generating dependencies, if requested.
const DependencyOutputOptions &DepOpts = getDependencyOutputOpts();
if (!DepOpts.OutputFile.empty())
@@ -644,13 +653,8 @@
/// instance.
static void compileModule(CompilerInstance &ImportingInstance,
StringRef ModuleName,
+ StringRef ModuleFileName,
StringRef UmbrellaHeader) {
- // Determine the file that we'll be writing to.
- llvm::SmallString<128> ModuleFile;
- ModuleFile +=
- ImportingInstance.getInvocation().getHeaderSearchOpts().ModuleCachePath;
- llvm::sys::path::append(ModuleFile, ModuleName + ".pcm");
-
// Construct a compiler invocation for creating this module.
llvm::IntrusiveRefCntPtr<CompilerInvocation> Invocation
(new CompilerInvocation(ImportingInstance.getInvocation()));
@@ -658,7 +662,7 @@
Invocation->getPreprocessorOpts().resetNonModularOptions();
FrontendOptions &FrontendOpts = Invocation->getFrontendOpts();
- FrontendOpts.OutputFile = ModuleFile.str();
+ FrontendOpts.OutputFile = ModuleFileName.str();
FrontendOpts.DisableFree = false;
FrontendOpts.Inputs.clear();
FrontendOpts.Inputs.push_back(
@@ -686,10 +690,6 @@
// FIXME: Need to synchronize when multiple processes do this.
Instance.ExecuteAction(CreateModuleAction);
- // Tell the importing instance's file manager to forget about the module
- // file, since we've just created it.
- ImportingInstance.getFileManager().forgetFile(ModuleFile);
-
// Tell the diagnostic client that it's (re-)starting to process a source
// file.
ImportingInstance.getDiagnosticClient()
@@ -710,8 +710,10 @@
// Search for a module with the given name.
std::string UmbrellaHeader;
+ std::string ModuleFileName;
const FileEntry *ModuleFile
= PP->getHeaderSearchInfo().lookupModule(ModuleName.getName(),
+ &ModuleFileName,
&UmbrellaHeader);
bool BuildingModule = false;
@@ -720,7 +722,7 @@
// can be used to create the module file. Create a separate compilation
// module to do so.
BuildingModule = true;
- compileModule(*this, ModuleName.getName(), UmbrellaHeader);
+ compileModule(*this, ModuleName.getName(), ModuleFileName, UmbrellaHeader);
ModuleFile = PP->getHeaderSearchInfo().lookupModule(ModuleName.getName());
}