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

Revert "Serialize local types and provide a lookup API"

Browse Source 
Changing the design of this to maintain more local context
information and changing the lookup API.

This reverts commit 4f2ff1819064dc61c20e31c7c308ae6b3e6615d0.

Swift SVN r24432
This commit is contained in:
David Farler
2015-01-15 00:33:10 +00:00
parent c5830745d7
commit cad9f99929
44 changed files with 194 additions and 1177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
lib/Serialization/ModuleFile.cpp
View File

@@ -253,61 +253,6 @@ public:
}
};
/// Used to deserialize local type decl entries from the on-disk decl hash
/// table representing LOCAL_TYPE_DECLS.
class ModuleFile::LocalDeclTableInfo {
public:
using internal_key_type = std::tuple<StringRef, unsigned, StringRef>;
using external_key_type = internal_key_type;
using data_type = DeclID;
using hash_value_type = uint32_t;
using offset_type = unsigned;
internal_key_type GetInternalKey(external_key_type ID) {
return ID;
}
external_key_type GetExternalKey(internal_key_type ID) {
return ID;
}
hash_value_type ComputeHash(internal_key_type key) {
std::string ConcatenatedMangling;
llvm::raw_string_ostream buffer(ConcatenatedMangling);
buffer << std::get<0>(key).str();
buffer << std::get<1>(key);
buffer << std::get<2>(key).str();
return llvm::HashString(buffer.str());
}
static bool EqualKey(internal_key_type lhs, internal_key_type rhs) {
return lhs == rhs;
}
static std::pair<unsigned, unsigned> ReadKeyDataLength(const uint8_t *&data) {
unsigned keyLength = endian::readNext<uint16_t, little, unaligned>(data);
unsigned dataLength = endian::readNext<uint16_t, little, unaligned>(data);
return { keyLength, dataLength };
}
static internal_key_type ReadKey(const uint8_t *data, unsigned length) {
auto fileHash = StringRef(reinterpret_cast<const char *>(data), 33);
data += 33;
auto discriminator = endian::readNext<unsigned, little, unaligned>(data);
length -= 33 + sizeof(unsigned);
auto name = StringRef(reinterpret_cast<const char *>(data), length);
return {fileHash, discriminator, name};
}
static data_type ReadData(internal_key_type key, const uint8_t *data,
unsigned length) {
return endian::readNext<uint32_t, little, unaligned>(data);
}
};
std::unique_ptr<ModuleFile::SerializedDeclTable>
ModuleFile::readDeclTable(ArrayRef<uint64_t> fields, StringRef blobData) {
uint32_t tableOffset;
@@ -319,17 +264,6 @@ ModuleFile::readDeclTable(ArrayRef<uint64_t> fields, StringRef blobData) {
base + sizeof(uint32_t), base));
}
std::unique_ptr<ModuleFile::SerializedLocalDeclTable>
ModuleFile::readLocalTypeDeclTable(ArrayRef<uint64_t> fields, StringRef blobData) {
uint32_t tableOffset;
index_block::DeclListLayout::readRecord(fields, tableOffset);
auto base = reinterpret_cast<const uint8_t *>(blobData.data());
using OwnedTable = std::unique_ptr<SerializedLocalDeclTable>;
return OwnedTable(SerializedLocalDeclTable::Create(base + tableOffset,
base + sizeof(uint32_t), base));
}
/// Used to deserialize entries in the on-disk Objective-C method table.
class ModuleFile::ObjCMethodTableInfo {
public:
@@ -430,9 +364,6 @@ bool ModuleFile::readIndexBlock(llvm::BitstreamCursor &cursor) {
case index_block::TOP_LEVEL_DECLS:
TopLevelDecls = readDeclTable(scratch, blobData);
break;
case index_block::LOCAL_TYPE_DECLS:
LocalTypeDecls = readLocalTypeDeclTable(scratch, blobData);
break;
case index_block::OPERATORS:
OperatorDecls = readDeclTable(scratch, blobData);
break;
@@ -999,22 +930,6 @@ void ModuleFile::lookupValue(DeclName name,
}
}
TypeDecl *ModuleFile::lookupLocalType(StringRef FileHash,
unsigned LocalDiscriminator,
StringRef Name) {
PrettyModuleFileDeserialization stackEntry(*this);
if (!LocalTypeDecls)
return nullptr;
auto iter = LocalTypeDecls->find(std::make_tuple(FileHash, LocalDiscriminator,
Name));
if (iter == LocalTypeDecls->end())
return nullptr;
return cast<TypeDecl>(getDecl(*iter));
}
OperatorDecl *ModuleFile::lookupOperator(Identifier name, DeclKind fixity) {
PrettyModuleFileDeserialization stackEntry(*this);
@@ -1308,16 +1223,6 @@ void ModuleFile::getTopLevelDecls(SmallVectorImpl<Decl *> &results) {
}
}
void ModuleFile::getLocalTypeDecls(SmallVectorImpl<Decl *> &results) {
if (LocalTypeDecls) {
for (auto key: LocalTypeDecls->keys()) {
auto decl = cast<TypeDecl>(getDecl(*LocalTypeDecls->find(key)));
decl->setLocalDiscriminator(std::get<1>(key));
results.push_back(decl);
}
}
}
void ModuleFile::getDisplayDecls(SmallVectorImpl<Decl *> &results) {
if (ShadowedModule)
ShadowedModule->getDisplayDecls(results);
@@ -1370,15 +1275,11 @@ Optional<BriefAndRawComment> ModuleFile::getCommentForDeclByUSR(StringRef USR) {
}
Identifier ModuleFile::getDiscriminatorForPrivateValue(const ValueDecl *D) {
Identifier discriminator = DiscriminatorsByValue.lookup(D);
Identifier discriminator = PrivateDiscriminatorsByValue.lookup(D);
assert(!discriminator.empty() && "no discriminator found for decl");
return discriminator;
}
Identifier ModuleFile::getDiscriminatorForLocalValue(const ValueDecl *D) {
return getDiscriminatorForPrivateValue(D);
}
void ModuleFile::verify() const {
#ifndef NDEBUG
for (const Serialized<Decl*> &next : Decls)