averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

AST: Nuke GenericParamList::AllArchetypes

Browse Source 
Now that SILFunctions no longer reference a GenericParamList, we
don't need to de-serialize cross-module references to archetypes
anymore.

This was the last remaining usage of AllArchetypes, so we can
finally rip it out.
This commit is contained in:
Slava Pestov
2016-08-20 05:10:24 -07:00
parent 58ceb472fa
commit 4bfaa47890
12 changed files with 10 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
lib/Serialization/Deserialization.cpp
View File

@@ -665,59 +665,12 @@ GenericParamList *ModuleFile::maybeReadGenericParams(DeclContext *DC,
if (next.Kind != llvm::BitstreamEntry::Record)
return nullptr;
// Read the raw archetype IDs into a different scratch buffer
// because we need to keep this alive for longer.
SmallVector<uint64_t, 4> rawArchetypeIDsBuffer;
unsigned kind = DeclTypeCursor.readRecord(next.ID, rawArchetypeIDsBuffer,
&blobData);
unsigned kind = DeclTypeCursor.readRecord(next.ID, scratch, &blobData);
if (kind != GENERIC_PARAM_LIST)
return nullptr;
// Read in the raw-archetypes buffer, but don't try to consume it yet.
ArrayRef<uint64_t> rawArchetypeIDs;
GenericParamListLayout::readRecord(rawArchetypeIDsBuffer, rawArchetypeIDs);
SmallVector<GenericTypeParamDecl *, 8> params;
SmallVector<RequirementRepr, 8> requirements;
SmallVector<ArchetypeType *, 8> archetypes;
// The GenericTypeParamDecls might be from a different module file.
// If so, we need to map the archetype IDs from the serialized
// all-archetypes list in this module file over to the corresponding
// archetypes from the original generic parameter decls, or else
// we'll end up constructing fresh archetypes that don't match the
// ones from the generic parameters.
// We have to do this mapping before we might call getType on one of
// those archetypes, but after we've read all the generic parameters.
// Therefore we do it lazily.
bool haveMappedArchetypes = false;
auto mapArchetypes = [&] {
if (haveMappedArchetypes) return;
GenericParamList::deriveAllArchetypes(params, archetypes);
assert(rawArchetypeIDs.size() == archetypes.size());
for (unsigned index : indices(rawArchetypeIDs)) {
TypeID TID = rawArchetypeIDs[index];
auto &typeOrOffset = Types[TID-1];
if (typeOrOffset.isComplete()) {
// FIXME: this assertion is absolutely correct, but it's
// currently fouled up by the presence of archetypes in
// substitutions. Those *should* be irrelevant for all the
// cases where this is wrong, but...
//assert(typeOrOffset.get().getPointer() == archetypes[index] &&
// "already deserialized this archetype to a different type!");
// TODO: remove unsafeOverwrite when this hack goes away
typeOrOffset.unsafeOverwrite(archetypes[index]);
} else {
typeOrOffset = archetypes[index];
}
}
haveMappedArchetypes = true;
};
while (true) {
lastRecordOffset.reset();
@@ -732,8 +685,6 @@ GenericParamList *ModuleFile::maybeReadGenericParams(DeclContext *DC,
&blobData);
switch (recordID) {
case GENERIC_PARAM: {
assert(!haveMappedArchetypes &&
"generic parameters interleaved with requirements?");
DeclID paramDeclID;
GenericParamLayout::readRecord(scratch, paramDeclID);
auto genericParam = cast<GenericTypeParamDecl>(getDecl(paramDeclID, DC));
@@ -760,8 +711,6 @@ GenericParamList *ModuleFile::maybeReadGenericParams(DeclContext *DC,
GenericRequirementLayout::readRecord(scratch, rawKind,
rawTypeIDs[0], rawTypeIDs[1]);
mapArchetypes();
switch (rawKind) {
case GenericRequirementKind::Conformance: {
auto subject = TypeLoc::withoutLoc(getType(rawTypeIDs[0]));
@@ -817,13 +766,9 @@ GenericParamList *ModuleFile::maybeReadGenericParams(DeclContext *DC,
break;
}
// Make sure we map the archetypes if we haven't yet.
mapArchetypes();
auto paramList = GenericParamList::create(getContext(), SourceLoc(),
params, SourceLoc(), requirements,
SourceLoc());
paramList->setAllArchetypes(getContext().AllocateCopy(archetypes));
paramList->setOuterParameters(outerParams ? outerParams :
DC->getGenericParamsOfContext());