averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40155 from ahoppen/pr/improve-module-search-path-lookup

Browse Source 
[Serialization] Improve module loading performance
This commit is contained in:
Alex Hoppen
2021-12-20 18:09:17 +01:00
committed by GitHub
parent 871c6b9b6c fe7878ecce
commit 669e3f34a6
24 changed files with 581 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Frontend/ModuleInterfaceLoader.cpp
View File

@@ -295,7 +295,7 @@ struct ModuleRebuildInfo {
StringRef prebuiltCacheDir, SourceLoc loc,
DiagArgs &&...diagArgs) {
diags.diagnose(loc, std::forward<DiagArgs>(diagArgs)...);
auto SDKVer = getSDKBuildVersion(ctx.SearchPathOpts.SDKPath);
auto SDKVer = getSDKBuildVersion(ctx.SearchPathOpts.getSDKPath());
llvm::SmallString<64> buffer = prebuiltCacheDir;
llvm::sys::path::append(buffer, "SystemVersion.plist");
auto PBMVer = getSDKBuildVersionFromPlist(buffer.str());
@@ -382,7 +382,7 @@ class ModuleInterfaceLoaderImpl {
if (!dep.isSDKRelative())
return dep.getPath();
path::native(ctx.SearchPathOpts.SDKPath, scratch);
path::native(ctx.SearchPathOpts.getSDKPath(), scratch);
llvm::sys::path::append(scratch, dep.getPath());
return StringRef(scratch.data(), scratch.size());
}
@@ -562,7 +562,7 @@ class ModuleInterfaceLoaderImpl {
}
bool canInterfaceHavePrebuiltModule() {
StringRef sdkPath = ctx.SearchPathOpts.SDKPath;
StringRef sdkPath = ctx.SearchPathOpts.getSDKPath();
if (!sdkPath.empty() &&
hasPrefix(path::begin(interfacePath), path::end(interfacePath),
path::begin(sdkPath), path::end(sdkPath))) {
@@ -607,7 +607,7 @@ class ModuleInterfaceLoaderImpl {
Optional<StringRef>
computeFallbackPrebuiltModulePath(llvm::SmallString<256> &scratch) {
namespace path = llvm::sys::path;
StringRef sdkPath = ctx.SearchPathOpts.SDKPath;
StringRef sdkPath = ctx.SearchPathOpts.getSDKPath();
// Check if this is a public interface file from the SDK.
if (sdkPath.empty() ||
@@ -1296,17 +1296,19 @@ void InterfaceSubContextDelegateImpl::inheritOptionsForBuildingInterface(
GenericArgs.push_back(ArgSaver.save(genericSubInvocation.getLangOptions()
.EffectiveLanguageVersion.asAPINotesVersionString()));
genericSubInvocation.setImportSearchPaths(SearchPathOpts.ImportSearchPaths);
genericSubInvocation.setFrameworkSearchPaths(SearchPathOpts.FrameworkSearchPaths);
if (!SearchPathOpts.SDKPath.empty()) {
genericSubInvocation.setImportSearchPaths(
SearchPathOpts.getImportSearchPaths());
genericSubInvocation.setFrameworkSearchPaths(
SearchPathOpts.getFrameworkSearchPaths());
if (!SearchPathOpts.getSDKPath().empty()) {
// Add -sdk arguments to the module building commands.
// Module building commands need this because dependencies sometimes use
// sdk-relative paths (prebuilt modules for example). Without -sdk, the command
// will not be able to local these dependencies, leading to unnecessary
// building from textual interfaces.
GenericArgs.push_back("-sdk");
GenericArgs.push_back(ArgSaver.save(SearchPathOpts.SDKPath));
genericSubInvocation.setSDKPath(SearchPathOpts.SDKPath);
GenericArgs.push_back(ArgSaver.save(SearchPathOpts.getSDKPath()));
genericSubInvocation.setSDKPath(SearchPathOpts.getSDKPath().str());
}
genericSubInvocation.getFrontendOptions().InputMode