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 #72091 from cachemeifyoucan/eng/PR-124056756

Browse Source 
[PackageInterface] Reduce parsing interface file for package-name
This commit is contained in:
Steven Wu
2024-03-05 13:31:55 -08:00
committed by GitHub
parent ddacabf863 1081f561c4
commit 698ae7b4ee
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -652,12 +652,21 @@ SerializedModuleBaseName::findInterfacePath(llvm::vfs::FileSystem &fs,
if (!fs.exists(interfacePath))
return std::nullopt;
// If in the same package, try return the package interface path if not
// preferring the interface file.
if (!ctx.LangOpts.AllowNonPackageInterfaceImportFromSamePackage) {
if (auto packageName = getPackageNameFromInterface(interfacePath, fs)) {
if (*packageName == ctx.LangOpts.PackageName)
return getPackageInterfacePathIfInSamePackage(fs, ctx);
// If there is a package name, try look for the package interface.
if (!ctx.LangOpts.PackageName.empty()) {
if (auto maybePackageInterface =
getPackageInterfacePathIfInSamePackage(fs, ctx))
return *maybePackageInterface;
// If package interface is not found, check if we can load the
// public/private interface file by checking:
// * if AllowNonPackageInterfaceImportFromSamePackage is true
// * if the package name is not equal so not in the same package.
if (!ctx.LangOpts.AllowNonPackageInterfaceImportFromSamePackage) {
if (auto packageName = getPackageNameFromInterface(interfacePath, fs)) {
if (*packageName == ctx.LangOpts.PackageName)
return std::nullopt;
}
}
}