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] Only allow loading modules during import resolution (#21218)

Browse Source 
Very early groundwork for private imports. Should not affect anything
today.
This commit is contained in:
Jordan Rose
2018-12-12 10:50:20 -08:00
committed by GitHub
parent 647c60b6b1
commit 4017416d5e
9 changed files with 84 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Serialization/ModuleFile.cpp
View File

@@ -455,7 +455,8 @@ public:
StringRef moduleNameOrMangledBase;
if (nameIDOrLength < 0) {
const ModuleDecl *module = File.getModule(-nameIDOrLength);
moduleNameOrMangledBase = module->getName().str();
if (module)
moduleNameOrMangledBase = module->getName().str();
} else {
moduleNameOrMangledBase =
StringRef(reinterpret_cast<const char *>(data), nameIDOrLength);
@@ -1497,7 +1498,7 @@ Status ModuleFile::associateWithFileContext(FileUnit *file,
assert(!modulePath.back().empty() &&
"invalid module name (submodules not yet supported)");
}
auto module = getModule(modulePath);
auto module = getModule(modulePath, /*allowLoading*/true);
if (!module || module->failedToLoad()) {
// If we're missing the module we're shadowing, treat that specially.
if (modulePath.size() == 1 &&
@@ -1735,7 +1736,7 @@ void ModuleFile::getImportDecls(SmallVectorImpl<Decl *> &Results) {
if (AccessPath.size() == 1 && AccessPath[0].first == Ctx.StdlibModuleName)
continue;
ModuleDecl *M = Ctx.getModule(AccessPath);
ModuleDecl *M = Ctx.getLoadedModule(AccessPath);
auto Kind = ImportKind::Module;
if (!ScopePath.empty()) {