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

[NFC] Further simplify ModuleFile::associateWithFileContext

Browse Source
This commit is contained in:
Brent Royal-Gordon
2020-08-31 14:48:45 -07:00
parent cce0411000
commit 4be67a6be1
1 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/Serialization/ModuleFile.cpp
View File

@@ -187,24 +187,17 @@ Status ModuleFile::associateWithFileContext(FileUnit *file, SourceLoc diagLoc) {
continue;
}
StringRef modulePathStr = dependency.Core.RawPath;
StringRef scopePath;
if (dependency.isScoped()) {
auto splitPoint = modulePathStr.find_last_of('\0');
assert(splitPoint != StringRef::npos);
scopePath = modulePathStr.substr(splitPoint+1);
modulePathStr = modulePathStr.slice(0, splitPoint);
ImportPath::Builder builder(ctx, dependency.Core.RawPath,
/*separator=*/'\0');
for (const auto &elem : builder) {
assert(!elem.Item.empty() && "invalid import path name");
}
// TODO: Further simplification is possible by unifying scopePath above with
// this.
ImportPath::Module::Builder modulePath(ctx, modulePathStr,
/*separator=*/'\0');
for (const auto &elem : modulePath) {
assert(!elem.Item.empty() &&
"invalid module name (submodules not yet supported)");
}
auto module = getModule(modulePath.get(), /*allowLoading*/true);
auto importPath = builder.copyTo(ctx);
auto modulePath = importPath.getModulePath(dependency.isScoped());
auto accessPath = importPath.getAccessPath(dependency.isScoped());
auto module = getModule(modulePath, /*allowLoading*/true);
if (!module || module->failedToLoad()) {
// If we're missing the module we're an overlay for, treat that specially.
if (modulePath.size() == 1 &&
@@ -219,16 +212,7 @@ Status ModuleFile::associateWithFileContext(FileUnit *file, SourceLoc diagLoc) {
continue;
}
if (scopePath.empty()) {
dependency.Import =
ModuleDecl::ImportedModule{ImportPath::Access(), module};
} else {
auto scopeID = ctx.getIdentifier(scopePath);
assert(!scopeID.empty() &&
"invalid decl name (non-top-level decls not supported)");
dependency.Import = ModuleDecl::ImportedModule{
ImportPath::Access::Builder(scopeID).copyTo(ctx), module};
}
dependency.Import = ModuleDecl::ImportedModule{accessPath, module};
// SPI
StringRef spisStr = dependency.Core.RawSPIs;