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

SILWitnessVisitor: canonicalize protocols for associated types

Browse Source 
Fixes <rdar://problem/20714534>.

Swift SVN r27990
This commit is contained in:
Slava Pestov
2015-04-30 18:41:11 +00:00
parent 18f0915432
commit 9d2d52b7ff
4 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/SILGen/SILGenDecl.cpp
View File

@@ -1388,7 +1388,8 @@ public:
witness.getSubstitutions());
}
void addAssociatedType(AssociatedTypeDecl *td) {
void addAssociatedType(AssociatedTypeDecl *td,
ArrayRef<ProtocolDecl *> protos) {
// Find the substitution info for the witness type.
const auto &witness = Conformance->getTypeWitness(td, /*resolver=*/nullptr);
@@ -1397,8 +1398,7 @@ public:
witness.getReplacement()->getCanonicalType()});
// Emit records for the protocol requirements on the type.
assert(td->getConformingProtocols(nullptr).size()
== witness.getConformances().size()
assert(protos.size() == witness.getConformances().size()
&& "number of conformances in assoc type substitution do not match "
"number of requirements on assoc type");
// The conformances should be all null or all nonnull.
@@ -1415,10 +1415,7 @@ public:
return !C;
})));
for (unsigned i = 0, e = td->getConformingProtocols(nullptr).size(); i < e;
++i) {
auto protocol = td->getConformingProtocols(nullptr)[i];
for (auto *protocol : protos) {
// Only reference the witness if the protocol requires it.
if (!SGM.Types.protocolRequiresWitnessTable(protocol))
continue;