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

Capture complete associated type substitution information in the AST.

Browse Source 
Previously, we only tracked the mapping from associated types to their
type witnesses. Now, also track the protocol conformances for each of
the requirements placed on the associated types.


Swift SVN r6655
This commit is contained in:
Doug Gregor
2013-07-26 22:04:53 +00:00
parent 27cbda9290
commit 709882c2b8
10 changed files with 92 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/Serialization/ModuleFile.cpp
View File

@@ -227,24 +227,6 @@ Pattern *ModuleFile::maybeReadPattern() {
}
}
/// Returns the equivalent archetype in the given protocol.
static ArchetypeType *getActualArchetype(ProtocolDecl *proto,
ArchetypeType *ty) {
if (!ty->isPrimary()) {
auto parent = getActualArchetype(proto, ty->getParent());
return parent->getNestedType(ty->getName());
}
auto matchingNames = proto->lookupDirect(ty->getName());
for (auto member : matchingNames) {
if (auto associatedType = dyn_cast<TypeAliasDecl>(member))
return associatedType->getUnderlyingType()->castTo<ArchetypeType>();
}
// Failed to find actual type?
return ty;
}
Optional<ConformancePair> ModuleFile::maybeReadConformance() {
using namespace decls_block;
@@ -290,7 +272,7 @@ Optional<ConformancePair> ModuleFile::maybeReadConformance() {
proto = cast<ProtocolDecl>(getDecl(protoID));
}
WitnessMap valueWitnesses;
WitnessMap witnesses;
ArrayRef<uint64_t>::iterator rawIDIter = rawIDs.begin();
while (valueCount--) {
ValueDecl *first, *second;
@@ -309,21 +291,18 @@ Optional<ConformancePair> ModuleFile::maybeReadConformance() {
}
ProtocolConformanceWitness witness{second, ctx.AllocateCopy(substitutions)};
valueWitnesses.insert(std::make_pair(first, witness));
witnesses.insert(std::make_pair(first, witness));
}
assert(rawIDIter <= rawIDs.end() && "read too much");
// Reset the offset RAII to the end of the trailing records.
lastRecordOffset.reset();
TypeSubstitutionMap typeWitnesses;
TypeWitnessMap typeWitnesses;
while (typeCount--) {
// FIXME: We don't actually want to allocate an archetype here; we just
// want to get an access path within the protocol.
auto first = getType(*rawIDIter++)->castTo<ArchetypeType>();
first = getActualArchetype(proto, first);
auto second = getType(*rawIDIter++);
typeWitnesses.insert(std::make_pair(first, second));
auto first = cast<TypeAliasDecl>(getDecl(*rawIDIter++));
auto second = maybeReadSubstitution();
assert(second.hasValue());
typeWitnesses[first] = *second;
}
assert(rawIDIter <= rawIDs.end() && "read too much");
@@ -334,8 +313,11 @@ Optional<ConformancePair> ModuleFile::maybeReadConformance() {
}
assert(rawIDIter <= rawIDs.end() && "read too much");
// Reset the offset RAII to the end of the trailing records.
lastRecordOffset.reset();
std::unique_ptr<ProtocolConformance> conformance(
new ProtocolConformance(std::move(valueWitnesses),
new ProtocolConformance(std::move(witnesses),
std::move(typeWitnesses),
std::move(inheritedConformances),
defaultedDefinitions));
@@ -415,9 +397,11 @@ Optional<Substitution> ModuleFile::maybeReadSubstitution() {
TypeID archetypeID, replacementID;
unsigned numConformances;
decls_block::BoundGenericSubstitutionLayout::readRecord(scratch,
archetypeID,
replacementID);
replacementID,
numConformances);
ArchetypeType *archetypeTy;
Type replacementTy;
@@ -431,7 +415,9 @@ Optional<Substitution> ModuleFile::maybeReadSubstitution() {
ASTContext &ctx = ModuleContext->Ctx;
SmallVector<ProtocolConformance *, 16> conformanceBuf;
while (auto conformancePair = maybeReadConformance()) {
while (numConformances--) {
auto conformancePair = maybeReadConformance();
assert(conformancePair.hasValue() && "Missing conformance");
auto conformance = processConformance(ctx, nullptr, canReplTy,
conformancePair->first,
conformancePair->second);