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

Turn SerializedModule into SerializedASTFile.

Browse Source 
Part of the FileUnit restructuring. A serialized module is now represented as
a TranslationUnit containing a single SerializedASTFile.

As part of this change, the FileUnit interface has been made virtual, rather
than switching on the Kind in every accessor. We think the operations
performed on files are sufficiently high-level that this shouldn't affect us.

A nice side effect of all this is that we now properly model the visibility
of modules imported into source files. Previously, we would always consider
the top-level imports of all files within a target, whether re-exported or
not.

We may still end up wanting to distinguish properties of a complete Swift
module file from a partial AST file, but we can do that within
SerializedModuleLoader.

Swift SVN r10832
This commit is contained in:
Jordan Rose
2013-12-05 01:51:09 +00:00
parent d0d661164d
commit 8b8cc8ee62
30 changed files with 634 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Serialization/ModuleFile.cpp
View File

@@ -269,7 +269,7 @@ static Optional<swift::LibraryKind> getActualLibraryKind(unsigned rawKind) {
ModuleFile::ModuleFile(llvm::OwningPtr<llvm::MemoryBuffer> &&input)
: ModuleContext(nullptr),
: FileContext(nullptr),
InputFile(std::move(input)),
InputReader(reinterpret_cast<const uint8_t *>(InputFile->getBufferStart()),
reinterpret_cast<const uint8_t *>(InputFile->getBufferEnd())),
@@ -451,12 +451,12 @@ static NominalTypeDecl *getAnyNominal(Decl *D) {
return dyn_cast_or_null<NominalTypeDecl>(D);
}
bool ModuleFile::associateWithModule(Module *module) {
bool ModuleFile::associateWithFileContext(FileUnit *file) {
assert(Status == ModuleStatus::Valid && "invalid module file");
assert(!ModuleContext && "already associated with an AST module");
ModuleContext = module;
assert(!FileContext && "already associated with an AST module");
FileContext = file;
ASTContext &ctx = module->Ctx;
ASTContext &ctx = getContext();
bool missingDependency = false;
for (auto &dependency : Dependencies) {
assert(!dependency.isLoaded() && "already loaded?");
@@ -593,7 +593,7 @@ void ModuleFile::loadDeclsConformingTo(KnownProtocolKind kind) {
auto index = static_cast<unsigned>(kind);
for (DeclID DID : KnownProtocolAdopters[index]) {
Decl *D = getDecl(DID);
ModuleContext->Ctx.recordConformance(kind, D);
getContext().recordConformance(kind, D);
if (auto nominal = getAnyNominal(D))
loadExtensions(nominal);
}
@@ -615,7 +615,7 @@ void ModuleFile::lookupClassMember(Module::AccessPathTy accessPath,
for (auto item : *iter) {
auto vd = cast<ValueDecl>(getDecl(item.second));
auto dc = vd->getDeclContext();
while (!dc->getParent()->isModuleContext())
while (!dc->getParent()->isModuleScopeContext())
dc = dc->getParent();
if (auto nominal = dc->getDeclaredTypeInContext()->getAnyNominal())
if (nominal->getName() == accessPath.front().first)
@@ -643,7 +643,7 @@ void ModuleFile::lookupClassMembers(Module::AccessPathTy accessPath,
for (auto item : list) {
auto vd = cast<ValueDecl>(getDecl(item.second));
auto dc = vd->getDeclContext();
while (!dc->getParent()->isModuleContext())
while (!dc->getParent()->isModuleScopeContext())
dc = dc->getParent();
if (auto nominal = dc->getDeclaredTypeInContext()->getAnyNominal())
if (nominal->getName() == accessPath.front().first)
@@ -661,7 +661,8 @@ void ModuleFile::lookupClassMembers(Module::AccessPathTy accessPath,
}
}
void ModuleFile::getLinkLibraries(Module::LinkLibraryCallback callback) const {
void
ModuleFile::collectLinkLibraries(Module::LinkLibraryCallback callback) const {
for (auto &lib : LinkLibraries)
callback(lib);
}