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: Use PackElementType to model references to pack elements of outer expansions

Browse Source
This commit is contained in:
Slava Pestov
2023-05-31 13:51:50 -04:00
parent 82a4826dcd
commit be218f5e16
12 changed files with 216 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/AST/ProtocolConformanceRef.cpp
View File

@@ -119,7 +119,9 @@ ProtocolConformanceRef::subst(Type origType, InFlightSubstitution &IFS) const {
}
// Check the conformance map.
return IFS.lookupConformance(origType->getCanonicalType(), substType, proto);
// FIXME: Pack element level?
return IFS.lookupConformance(origType->getCanonicalType(), substType, proto,
/*level=*/0);
}
ProtocolConformanceRef ProtocolConformanceRef::mapConformanceOutOfContext() const {
@@ -130,7 +132,8 @@ ProtocolConformanceRef ProtocolConformanceRef::mapConformanceOutOfContext() cons
return archetypeType->getInterfaceType();
return type;
},
MakeAbstractConformanceForGenericType());
MakeAbstractConformanceForGenericType(),
SubstFlags::PreservePackExpansionLevel);
return ProtocolConformanceRef(concrete);
} else if (isPack()) {
return getPack()->subst(
@@ -139,7 +142,8 @@ ProtocolConformanceRef ProtocolConformanceRef::mapConformanceOutOfContext() cons
return archetypeType->getInterfaceType();
return type;
},
MakeAbstractConformanceForGenericType());
MakeAbstractConformanceForGenericType(),
SubstFlags::PreservePackExpansionLevel);
}
return *this;