Skip to content

Serialization: Use checked substitution map deserialization for type nodes #31926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 21, 2020
Merged

Serialization: Use checked substitution map deserialization for type nodes #31926

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions lib/Serialization/Deserialization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4848,7 +4848,9 @@ class TypeDeserializer {
auto substitutedType = substitutedTypeOrError.get();

// Read the substitutions.
auto subMap = MF.getSubstitutionMap(substitutionsID);
auto subMapOrError = MF.getSubstitutionMapChecked(substitutionsID);
if (!subMapOrError)
return subMapOrError.takeError();

auto parentTypeOrError = MF.getTypeChecked(parentTypeID);
if (!parentTypeOrError)
Expand All @@ -4858,11 +4860,12 @@ class TypeDeserializer {
if (alias &&
alias->getAttrs().isUnavailable(ctx) &&
alias->isCompatibilityAlias()) {
return alias->getUnderlyingType().subst(subMap);
return alias->getUnderlyingType().subst(subMapOrError.get());
}

auto parentType = parentTypeOrError.get();
return TypeAliasType::get(alias, parentType, subMap, substitutedType);
return TypeAliasType::get(alias, parentType, subMapOrError.get(),
substitutedType);
}

Expected<Type> deserializeNominalType(ArrayRef<uint64_t> scratch,
Expand Down Expand Up @@ -5180,9 +5183,11 @@ class TypeDeserializer {
return opaqueTypeOrError.takeError();

auto opaqueDecl = cast<OpaqueTypeDecl>(opaqueTypeOrError.get());
auto subs = MF.getSubstitutionMap(subsID);
auto subsOrError = MF.getSubstitutionMapChecked(subsID);
if (!subsOrError)
return subsOrError.takeError();

return OpaqueTypeArchetypeType::get(opaqueDecl, subs);
return OpaqueTypeArchetypeType::get(opaqueDecl, subsOrError.get());
}

Expected<Type> deserializeNestedArchetypeType(ArrayRef<uint64_t> scratch,
Expand Down Expand Up @@ -5317,8 +5322,11 @@ class TypeDeserializer {
if (!layout)
return nullptr;

auto subMap = MF.getSubstitutionMap(subMapID);
return SILBoxType::get(ctx, layout, subMap);
auto subMapOrError = MF.getSubstitutionMapChecked(subMapID);
if (!subMapOrError)
return subMapOrError.takeError();

return SILBoxType::get(ctx, layout, subMapOrError.get());
}

Expected<Type> deserializeSILFunctionType(ArrayRef<uint64_t> scratch,
Expand Down Expand Up @@ -5503,16 +5511,19 @@ class TypeDeserializer {

GenericSignature invocationSig =
MF.getGenericSignature(rawInvocationGenericSig);
SubstitutionMap invocationSubs =
MF.getSubstitutionMap(rawInvocationSubs).getCanonical();
SubstitutionMap patternSubs =
MF.getSubstitutionMap(rawPatternSubs).getCanonical();
auto invocationSubsOrErr = MF.getSubstitutionMapChecked(rawInvocationSubs);
if (!invocationSubsOrErr)
return invocationSubsOrErr.takeError();
auto patternSubsOrErr = MF.getSubstitutionMapChecked(rawPatternSubs);
if (!patternSubsOrErr)
return patternSubsOrErr.takeError();

return SILFunctionType::get(invocationSig, extInfo, coroutineKind.getValue(),
calleeConvention.getValue(),
allParams, allYields, allResults,
errorResult,
patternSubs, invocationSubs,
patternSubsOrErr.get().getCanonical(),
invocationSubsOrErr.get().getCanonical(),
ctx, witnessMethodConformance);
}

Expand Down