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: Don't crash when serializing conformances with interface types in them

Browse Source
This commit is contained in:
Slava Pestov
2017-04-17 18:19:05 -06:00
parent cc611de2aa
commit a3f725ac2f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Serialization/Serialization.cpp
View File

@@ -1394,7 +1394,7 @@ Serializer::writeConformance(ProtocolConformanceRef conformanceRef,
auto substitutions = conf->getGenericSubstitutions();
unsigned abbrCode = abbrCodes[SpecializedProtocolConformanceLayout::Code];
auto type = conf->getType();
if (genericEnv)
if (genericEnv && type->hasArchetype())
type = genericEnv->mapTypeOutOfContext(type);
SpecializedProtocolConformanceLayout::emitRecord(Out, ScratchRecord,
abbrCode,
@@ -1412,7 +1412,7 @@ Serializer::writeConformance(ProtocolConformanceRef conformanceRef,
= abbrCodes[InheritedProtocolConformanceLayout::Code];
auto type = conf->getType();
if (genericEnv)
if (genericEnv && type->hasArchetype())
type = genericEnv->mapTypeOutOfContext(type);
InheritedProtocolConformanceLayout::emitRecord(
@@ -1451,7 +1451,7 @@ Serializer::writeSubstitutions(SubstitutionList substitutions,
for (auto &sub : substitutions) {
auto replacementType = sub.getReplacement();
if (genericEnv) {
if (genericEnv && replacementType->hasArchetype()) {
replacementType =
genericEnv->mapTypeOutOfContext(replacementType);
}