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

This commit is contained in:
swift-ci
2021-08-06 16:13:41 -07:00
24 changed files with 205 additions and 47 deletions

View File

@@ -5901,6 +5901,18 @@ public:
return OptionalType::get(baseTy.get());
}
Expected<Type> deserializeVariadicSequenceType(ArrayRef<uint64_t> scratch,
StringRef blobData) {
TypeID baseID;
decls_block::VariadicSequenceTypeLayout::readRecord(scratch, baseID);
auto baseTy = MF.getTypeChecked(baseID);
if (!baseTy)
return baseTy.takeError();
return VariadicSequenceType::get(baseTy.get());
}
Expected<Type> deserializeUnboundGenericType(ArrayRef<uint64_t> scratch,
StringRef blobData) {
DeclID genericID;
@@ -6024,6 +6036,7 @@ Expected<Type> TypeDeserializer::getTypeCheckedImpl() {
CASE(ArraySlice)
CASE(Dictionary)
CASE(Optional)
CASE(VariadicSequence)
CASE(UnboundGeneric)
CASE(Error)