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

[Serialization] Refactor logic deciding transitive module loading logic

Browse Source 
Refactor and centralize the logic about how implementation-only and
package-only dependencies should be loaded.
This commit is contained in:
Alexis Laferrière
2023-03-15 22:19:21 -07:00
parent 2bc92a6a59
commit 61c0827427
5 changed files with 99 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/Serialization/ModuleFile.cpp
View File

@@ -194,23 +194,11 @@ Status ModuleFile::associateWithFileContext(FileUnit *file, SourceLoc diagLoc,
continue;
}
// If this module file is being installed into the main module, it's treated
// as a partial module.
auto isPartialModule = M->isMainModule();
ModuleLoadingBehavior transitiveBehavior =
getTransitiveLoadingBehavior(dependency);
if (dependency.isImplementationOnly() &&
!(isPartialModule || ctx.LangOpts.DebuggerSupport)) {
// When building normally (and not merging partial modules), we don't
// want to bring in the implementation-only module, because that might
// change the set of visible declarations. However, when debugging we
// want to allow getting at the internals of this module when possible,
// and so we'll try to reference the implementation-only module if it's
// available.
continue;
}
if (dependency.isPackageOnly() &&
ctx.LangOpts.PackageName != this->getModulePackageName())
// Skip this dependency?
if (transitiveBehavior == ModuleLoadingBehavior::Ignored)
continue;
ImportPath::Builder builder(ctx, dependency.Core.RawPath,
@@ -230,11 +218,13 @@ Status ModuleFile::associateWithFileContext(FileUnit *file, SourceLoc diagLoc,
modulePath.front().Item == file->getParentModule()->getName()) {
return error(Status::MissingUnderlyingModule);
}
// Otherwise, continue trying to load dependencies, so that we can list
// everything that's missing.
if (!(dependency.isImplementationOnly() && ctx.LangOpts.DebuggerSupport))
// Report a missing dependency only when really needed.
if (transitiveBehavior == ModuleLoadingBehavior::Required)
missingDependency = true;
continue;
}
@@ -269,6 +259,21 @@ Status ModuleFile::associateWithFileContext(FileUnit *file, SourceLoc diagLoc,
return status;
}
ModuleLoadingBehavior
ModuleFile::getTransitiveLoadingBehavior(const Dependency &dependency) const {
ASTContext &ctx = getContext();
ModuleDecl *mod = FileContext->getParentModule();
// If this module file is being installed into the main module, it's treated
// as a partial module.
auto isPartialModule = mod->isMainModule();
return Core->getTransitiveLoadingBehavior(dependency.Core,
ctx.LangOpts.DebuggerSupport,
isPartialModule,
ctx.LangOpts.PackageName);
}
bool ModuleFile::mayHaveDiagnosticsPointingAtBuffer() const {
if (!hasError())
return false;