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

Allow loading package interface if in same package.

Browse Source 
Add a new flag to enable package interface loading.
Use the last value of package-name in case of dupes.
Rename PrintInterfaceContentMode as InterfaceMode.
Update diagnostics.
Test package interface loading with various scenarios.
Test duplicate package-name.
This commit is contained in:
Ellie Shin
2023-11-08 17:40:40 -08:00
parent aba3b6c24e
commit e5ca8e5c0b
18 changed files with 316 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -596,7 +596,11 @@ std::string SerializedModuleBaseName::getName(file_types::ID fileTy) const {
return std::string(result.str());
}
llvm::Optional<std::string> SerializedModuleLoaderBase::getPackageInterfacePathIfInSamePackage(llvm::vfs::FileSystem &fs, ASTContext &ctx) {
llvm::Optional<std::string> SerializedModuleBaseName::getPackageInterfacePathIfInSamePackage(llvm::vfs::FileSystem &fs, ASTContext &ctx) const {
if (!ctx.LangOpts.EnablePackageInterfaceLoad)
return {};
std::string packagePath{
getName(file_types::TY_PackageSwiftModuleInterfaceFile)};
@@ -612,8 +616,9 @@ llvm::Optional<std::string> SerializedModuleLoaderBase::getPackageInterfacePathI
for (unsigned I = 0, N = args.size(); I + 1 < N; I++) {
StringRef current(args[I]), next(args[I + 1]);
if (current == "-package-name") {
// Instead of `break` here, continue to get the last value in case of dupes,
// to be consistent with the default parsing logic.
result = next;
break;
}
}
}
@@ -628,17 +633,18 @@ llvm::Optional<std::string> SerializedModuleLoaderBase::getPackageInterfacePathI
llvm::Optional<std::string>
SerializedModuleBaseName::findInterfacePath(llvm::vfs::FileSystem &fs, ASTContext &ctx) const {
std::string interfacePath{getName(file_types::TY_SwiftModuleInterfaceFile)};
// Ensure the public swiftinterface already exists, otherwise bail early.
// Ensure the public swiftinterface already exists, otherwise bail early
// as it's considered the module doesn't exist.
if (!fs.exists(interfacePath))
return {};
// Check if a package interface exists and if the package name applies to
// the importer module.
auto packagePath = getPackageInterfacePathIfInSamePackage(fs, ctx);
if (fs.exists(packagePath))
return packagePath;
auto pkgPath = getPackageInterfacePathIfInSamePackage(fs, ctx).value_or("");
if (fs.exists(pkgPath))
return pkgPath;
// If above fails, use the existing logic.
// If above fails, use the existing logic as fallback.
// If present, use the private interface instead of the public one.
std::string privatePath{
getName(file_types::TY_PrivateSwiftModuleInterfaceFile)};