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

10
tools/SourceKit/lib/SwiftLang/SwiftEditorInterfaceGen.cpp
View File

@@ -510,9 +510,9 @@ bool SwiftInterfaceGenContext::matches(StringRef ModuleName,
const SearchPathOptions &SPOpts = Invok.getSearchPathOptions();
const SearchPathOptions &ImplSPOpts = Impl.Invocation.getSearchPathOptions();
if (SPOpts.ImportSearchPaths != ImplSPOpts.ImportSearchPaths)
if (SPOpts.getImportSearchPaths() != ImplSPOpts.getImportSearchPaths())
return false;
if (SPOpts.FrameworkSearchPaths != ImplSPOpts.FrameworkSearchPaths)
if (SPOpts.getFrameworkSearchPaths() != ImplSPOpts.getFrameworkSearchPaths())
return false;
if (Invok.getClangImporterOptions().ExtraArgs !=
@@ -857,14 +857,14 @@ void SwiftLangSupport::findInterfaceDocument(StringRef ModuleName,
addArgPair("-target", Invocation.getTargetTriple());
const auto &SPOpts = Invocation.getSearchPathOptions();
addArgPair("-sdk", SPOpts.SDKPath);
for (auto &FramePath : SPOpts.FrameworkSearchPaths) {
addArgPair("-sdk", SPOpts.getSDKPath());
for (const auto &FramePath : SPOpts.getFrameworkSearchPaths()) {
if (FramePath.IsSystem)
addArgPair("-Fsystem", FramePath.Path);
else
addArgPair("-F", FramePath.Path);
}
for (auto &Path : SPOpts.ImportSearchPaths)
for (const auto &Path : SPOpts.getImportSearchPaths())
addArgPair("-I", Path);
const auto &ClangOpts = Invocation.getClangImporterOptions();