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

Serialization: Fix deserialization of generic typealiases

Browse Source 
The recovery logic was erronously kicking in, because it was comparing
the substituted underlying type with the declaration's underlying type.

For a generic typealias, these never equal, so instead, serialize the
unsubstituted type, and substitute it in deserialization.
This commit is contained in:
Slava Pestov
2018-09-11 14:30:30 -07:00
parent e180bf9d4e
commit 3feaf8731a
6 changed files with 74 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lib/Serialization/Deserialization.cpp
View File

@@ -4195,37 +4195,53 @@ Expected<Type> ModuleFile::getTypeChecked(TypeID TID) {
return aliasOrError.takeError();
auto alias = dyn_cast<TypeAliasDecl>(aliasOrError.get());
bool formSugaredType = true;
Type underlyingType;
if (ctx.LangOpts.EnableDeserializationRecovery) {
Expected<Type> expectedType = getTypeChecked(underlyingTypeID);
if (!expectedType)
return expectedType.takeError();
if (expectedType.get()) {
if (!alias ||
!alias->getDeclaredInterfaceType()->isEqual(expectedType.get())) {
// Fall back to the canonical type.
typeOrOffset = expectedType.get()->getCanonicalType();
break;
}
auto underlyingTypeOrError = getTypeChecked(underlyingTypeID);
if (!underlyingTypeOrError)
return underlyingTypeOrError.takeError();
underlyingType = underlyingTypeOrError.get();
if (!alias ||
!alias->getDeclaredInterfaceType()->isEqual(underlyingType)) {
// Fall back to the canonical type.
formSugaredType = false;
}
underlyingType = expectedType.get();
} else {
underlyingType = getType(underlyingTypeID);
}
Type parentType = getType(parentTypeID);
// Read the substitutions.
SubstitutionMap subMap = getSubstitutionMap(substitutionsID);
auto subMap = getSubstitutionMap(substitutionsID);
underlyingType = underlyingType.subst(subMap);
assert(underlyingType);
// Look through compatibility aliases that are now unavailable.
if (alias->getAttrs().isUnavailable(ctx) &&
alias->isCompatibilityAlias()) {
typeOrOffset = alias->getUnderlyingTypeLoc().getType();
auto parentTypeOrError = getTypeChecked(parentTypeID);
if (!parentTypeOrError) {
typeOrOffset = underlyingType;
break;
}
// Look through compatibility aliases that are now unavailable.
if (alias &&
alias->getAttrs().isUnavailable(ctx) &&
alias->isCompatibilityAlias()) {
underlyingType = alias->getUnderlyingTypeLoc().getType().subst(subMap);
assert(underlyingType);
typeOrOffset = underlyingType;
break;
}
if (!formSugaredType) {
typeOrOffset = underlyingType;
break;
}
auto parentType = parentTypeOrError.get();
typeOrOffset = NameAliasType::get(alias, parentType, subMap,
underlyingType);
break;