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

AST: Introduce ElementArchetypeType

Browse Source
This commit is contained in:
Slava Pestov
2022-10-21 19:36:47 -04:00
parent 82d78a384f
commit 68514b10b5
18 changed files with 451 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/Serialization/Deserialization.cpp
View File

@@ -1220,9 +1220,10 @@ ModuleFile::getGenericEnvironmentChecked(serialization::GenericEnvironmentID ID)
if (recordID != GENERIC_ENVIRONMENT)
fatal(llvm::make_error<InvalidRecordKindError>(recordID));
unsigned kind;
GenericSignatureID parentSigID;
TypeID existentialID;
GenericEnvironmentLayout::readRecord(scratch, existentialID, parentSigID);
GenericEnvironmentLayout::readRecord(scratch, kind, existentialID, parentSigID);
auto existentialTypeOrError = getTypeChecked(existentialID);
if (!existentialTypeOrError)
@@ -1232,8 +1233,18 @@ ModuleFile::getGenericEnvironmentChecked(serialization::GenericEnvironmentID ID)
if (!parentSigOrError)
return parentSigOrError.takeError();
auto *genericEnv = GenericEnvironment::forOpenedExistential(
existentialTypeOrError.get(), parentSigOrError.get(), UUID::fromTime());
GenericEnvironment *genericEnv = nullptr;
switch (GenericEnvironmentKind(kind)) {
case GenericEnvironmentKind::OpenedExistential:
genericEnv = GenericEnvironment::forOpenedExistential(
existentialTypeOrError.get(), parentSigOrError.get(), UUID::fromTime());
break;
case GenericEnvironmentKind::OpenedElement:
genericEnv = GenericEnvironment::forOpenedElement(
parentSigOrError.get(), UUID::fromTime());
}
envOffset = genericEnv;
return genericEnv;
@@ -5914,6 +5925,26 @@ Expected<Type> DESERIALIZE_TYPE(PACK_ARCHETYPE_TYPE)(
return contextType;
}
Expected<Type> DESERIALIZE_TYPE(ELEMENT_ARCHETYPE_TYPE)(
ModuleFile &MF, SmallVectorImpl<uint64_t> &scratch, StringRef blobData) {
TypeID interfaceID;
GenericEnvironmentID genericEnvID;
decls_block::ElementArchetypeTypeLayout::readRecord(scratch,
interfaceID,
genericEnvID);
auto interfaceTypeOrError = MF.getTypeChecked(interfaceID);
if (!interfaceTypeOrError)
return interfaceTypeOrError.takeError();
auto envOrError = MF.getGenericEnvironmentChecked(genericEnvID);
if (!envOrError)
return envOrError.takeError();
return envOrError.get()->mapTypeIntoContext(interfaceTypeOrError.get());
}
Expected<Type>
DESERIALIZE_TYPE(GENERIC_TYPE_PARAM_TYPE)(
ModuleFile &MF, SmallVectorImpl<uint64_t> &scratch, StringRef blobData) {