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] Serialize import access paths, and only the TU's own imports.

Browse Source 
Previously, a module contained references to every module listed in the
ASTContext. Now, we actually only encode the imports from the TU itself,
which allows us to include access paths for scoped imports.
This is necessary to implement proper name lookup shadowing rules.

Swift SVN r7013
This commit is contained in:
Jordan Rose
2013-08-07 22:56:41 +00:00
parent d3b31b8b72
commit 42a109674d
5 changed files with 58 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/Serialization/ModuleFile.cpp
View File

@@ -2118,10 +2118,29 @@ bool ModuleFile::associateWithModule(Module *module) {
ASTContext &ctx = module->Ctx;
bool missingDependency = false;
for (auto &dependency : Dependencies) {
assert(!dependency.Mod && "already loaded?");
dependency.Mod = getModule(ctx.getIdentifier(dependency.Name));
if (!dependency.Mod)
assert(!dependency.isLoaded() && "already loaded?");
StringRef modulePath, scopePath;
llvm::tie(modulePath, scopePath) = dependency.RawAccessPath.split('\0');
auto moduleID = ctx.getIdentifier(modulePath);
assert(!moduleID.empty() &&
"invalid module name (submodules not yet supported)");
auto module = getModule(moduleID);
if (!module) {
missingDependency = true;
continue;
}
if (scopePath.empty()) {
dependency.Import = { {}, module };
} else {
auto scopeID = ctx.getIdentifier(scopePath);
assert(!scopeID.empty() &&
"invalid decl name (non-top-level decls not supported)");
auto path = Module::AccessPathTy({scopeID, SourceLoc()});
dependency.Import = { ctx.AllocateCopy(path), module };
}
}
if (missingDependency) {
@@ -2186,9 +2205,10 @@ OperatorDecl *ModuleFile::lookupOperator(Identifier name, DeclKind fixity) {
void ModuleFile::getReexportedModules(
SmallVectorImpl<Module::ImportedModule> &results) {
// FIXME: Lock down on re-exports.
// FIXME: Handle imports with access paths.
for (auto &dep : Dependencies)
results.push_back({Module::AccessPathTy(), dep.Mod});
for (auto &dep : Dependencies) {
assert(dep.isLoaded());
results.push_back(dep.Import);
}
}
void ModuleFile::lookupVisibleDecls(Module::AccessPathTy accessPath,