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] Hook up basic name lookup for imported modules.

Browse Source 
Also, explicitly list the top-level decls in a module. Eventually this
will be a proper lazily-loaded identifier-DeclID map, but for now it's
just a flat list of IDs to deserialize as soon as a lookup is
requested.

We can now parse and typecheck a file that imports typealiases of builtin
types.

Swift SVN r5325
This commit is contained in:
Jordan Rose
2013-05-25 01:34:57 +00:00
parent 76b19d53c4
commit 7a13e58b38
6 changed files with 89 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/Serialization/ModuleFile.cpp
View File

@@ -62,7 +62,7 @@ validateControlBlock(llvm::BitstreamCursor &cursor,
return result;
}
const Decl *ModuleFile::getDecl(DeclID DID) {
Decl *ModuleFile::getDecl(DeclID DID) {
if (DID == 0)
return nullptr;
@@ -296,14 +296,16 @@ ModuleFile::ModuleFile(llvm::OwningPtr<llvm::MemoryBuffer> &&input)
switch (kind) {
case index_block::DECL_OFFSETS:
assert(blobData.empty());
// FIXME: Use proper BCRecordLayout for this.
Decls.assign(scratch.begin(), scratch.end());
break;
case index_block::TYPE_OFFSETS:
assert(blobData.empty());
// FIXME: Use proper BCRecordLayout for this.
Types.assign(scratch.begin(), scratch.end());
break;
case index_block::TOP_LEVEL_DECLS:
assert(blobData.empty());
RawTopLevelIDs.assign(scratch.begin(), scratch.end());
break;
default:
// Unknown index kind, which this version of the compiler won't use.
break;
@@ -337,3 +339,22 @@ ModuleFile::ModuleFile(llvm::OwningPtr<llvm::MemoryBuffer> &&input)
if (topLevelEntry.Kind != llvm::BitstreamEntry::EndBlock)
return error();
}
void ModuleFile::buildTopLevelDeclMap() {
// FIXME: be more lazy about deserialization by encoding this some other way.
for (DeclID ID : RawTopLevelIDs) {
auto value = cast<ValueDecl>(getDecl(ID));
TopLevelIDs[value->getName()] = ID;
}
RawTopLevelIDs.clear();
}
void ModuleFile::lookupValue(Identifier name,
SmallVectorImpl<ValueDecl*> &results) {
if (!RawTopLevelIDs.empty())
buildTopLevelDeclMap();
if (DeclID ID = TopLevelIDs.lookup(name))
results.push_back(cast<ValueDecl>(getDecl(ID)));
}