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

This commit is contained in:
swift-ci
2023-08-10 04:34:00 -07:00
33 changed files with 201 additions and 249 deletions

View File

@@ -1843,16 +1843,10 @@ Serializer::writeASTBlockEntity(ProtocolConformance *conformance) {
DeclTypeAbbrCodes[BuiltinProtocolConformanceLayout::Code];
auto typeID = addTypeRef(builtin->getType());
auto protocolID = addDeclRef(builtin->getProtocol());
auto genericSigID = addGenericSignatureRef(builtin->getGenericSignature());
SmallVector<uint64_t, 16> requirementData;
serializeGenericRequirements(builtin->getConditionalRequirements(),
requirementData);
BuiltinProtocolConformanceLayout::emitRecord(
Out, ScratchRecord, abbrCode, typeID, protocolID, genericSigID,
static_cast<unsigned>(builtin->getBuiltinConformanceKind()),
requirementData);
Out, ScratchRecord, abbrCode, typeID, protocolID,
static_cast<unsigned>(builtin->getBuiltinConformanceKind()));
break;
}
}