Merge remote-tracking branch 'origin/master' into master-next

This commit is contained in:
Arnold Schwaighofer
2019-08-28 06:50:47 -07:00
63 changed files with 1045 additions and 579 deletions

View File

@@ -370,7 +370,8 @@ bool CompilerInstance::setUpModuleLoaders() {
StringRef PrebuiltModuleCachePath = FEOpts.PrebuiltModuleCachePath;
auto PIML = ParseableInterfaceModuleLoader::create(
*Context, ModuleCachePath, PrebuiltModuleCachePath,
getDependencyTracker(), MLM, FEOpts.RemarkOnRebuildFromModuleInterface);
getDependencyTracker(), MLM, FEOpts.PreferInterfaceForModules,
FEOpts.RemarkOnRebuildFromModuleInterface);
Context->addModuleLoader(std::move(PIML));
}
Context->addModuleLoader(std::move(SML));