Merge remote-tracking branch 'origin/main' into rebranch

This commit is contained in:
swift-ci
2023-10-11 18:14:16 -07:00
17 changed files with 441 additions and 244 deletions

View File

@@ -1695,12 +1695,15 @@ void Serializer::writeLocalNormalProtocolConformance(
SmallVector<DeclID, 32> data;
unsigned numValueWitnesses = 0;
unsigned numTypeWitnesses = 0;
unsigned numSignatureConformances =
conformance->getSignatureConformances().size();
unsigned numSignatureConformances = 0;
for (auto sigConformance : conformance->getSignatureConformances()) {
data.push_back(addConformanceRef(sigConformance));
}
conformance->forEachAssociatedConformance(
[&](Type t, ProtocolDecl *proto, unsigned index) {
auto assocConf = conformance->getAssociatedConformance(t, proto);
data.push_back(addConformanceRef(assocConf));
++numSignatureConformances;
return false;
});
conformance->forEachTypeWitness([&](AssociatedTypeDecl *assocType,
Type type, TypeDecl *typeDecl) {