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

Eliminate special handling of deserialized inherited protocols.

Browse Source 
Now that we have the inheritance lists hanging around, use them: it
makes the conformance lookup table use the same code whether we're
deserializing the conformances or parsing them.

Swift SVN r31383
This commit is contained in:
Doug Gregor
2015-08-21 17:51:26 +00:00
parent 6a07b8a5c1
commit 00040112cd
5 changed files with 20 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/AST/ProtocolConformance.cpp
View File

@@ -1055,15 +1055,6 @@ void ConformanceLookupTable::forEachInStage(ConformanceStage stage,
resolver->resolveDeclSignature(nominal);
}
// For a protocol that has been deserialized, adopt the inherited
// protocols as explicit conformances.
if (auto proto = dyn_cast<ProtocolDecl>(nominal)) {
for (auto inherited : proto->takeDirectlyInheritedProtocols()) {
addProtocol(proto, inherited, SourceLoc(),
ConformanceSource::forExplicit(proto));
}
}
nominalFunc(nominal);
}
@@ -1430,6 +1421,11 @@ void ConformanceLookupTable::addProtocols(NominalTypeDecl *nominal,
[&](ProtocolDecl *protocol, SourceLoc loc) {
addProtocol(nominal, protocol, loc, source);
});
} else {
visitProtocols(entry.getType(), SourceLoc(),
[&](ProtocolDecl *protocol, SourceLoc loc) {
addProtocol(nominal, protocol, loc, source);
});
}
}
}
@@ -1467,27 +1463,10 @@ void ConformanceLookupTable::expandImpliedConformances(NominalTypeDecl *nominal,
}
}
// FIXME: It's odd that the inheritance clause isn't loaded at all during
// deserialization, so we have this weird separate path.
if (!conformingProtocol->getParentSourceFile()) {
for (auto protocol : conformingProtocol->getInheritedProtocols(
resolver)) {
addProtocol(nominal, protocol, SourceLoc(),
ConformanceSource::forImplied(conformanceEntry));
}
continue;
}
for (const auto &entry : conformingProtocol->getInherited()) {
if (auto typeRepr = entry.getTypeRepr()) {
visitProtocols(typeRepr, resolver,
[&](ProtocolDecl *protocol, SourceLoc loc) {
addProtocol(nominal, protocol, loc,
ConformanceSource::forImplied(
conformanceEntry));
});
}
}
// Add inherited protocols.
addProtocols(nominal, conformingProtocol->getInherited(),
ConformanceSource::forImplied(conformanceEntry),
resolver);
}
}
@@ -2225,7 +2204,7 @@ DeclContext::getLocalProtocols(
nullptr,
diagnostics);
/// Sort if requred.
// Sort if requred.
if (sorted) {
llvm::array_pod_sort(result.begin(), result.end(),
&ProtocolType::compareProtocols);