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: Change return type of ProtocolConformance::subst() to ProtocolConformanceRef

Browse Source
This commit is contained in:
Slava Pestov
2023-09-08 15:38:38 -04:00
parent bc7139bad5
commit eefa409656
4 changed files with 50 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/AST/ProtocolConformanceRef.cpp
View File

@@ -87,7 +87,7 @@ ProtocolConformanceRef::subst(Type origType, InFlightSubstitution &IFS) const {
return *this;
if (isConcrete())
return ProtocolConformanceRef(getConcrete()->subst(IFS));
return getConcrete()->subst(IFS);
if (isPack())
return getPack()->subst(IFS);
@@ -126,7 +126,7 @@ ProtocolConformanceRef::subst(Type origType, InFlightSubstitution &IFS) const {
ProtocolConformanceRef ProtocolConformanceRef::mapConformanceOutOfContext() const {
if (isConcrete()) {
auto *concrete = getConcrete()->subst(
return getConcrete()->subst(
[](SubstitutableType *type) -> Type {
if (auto *archetypeType = type->getAs<ArchetypeType>())
return archetypeType->getInterfaceType();
@@ -134,7 +134,6 @@ ProtocolConformanceRef ProtocolConformanceRef::mapConformanceOutOfContext() cons
},
MakeAbstractConformanceForGenericType(),
SubstFlags::PreservePackExpansionLevel);
return ProtocolConformanceRef(concrete);
} else if (isPack()) {
return getPack()->subst(
[](SubstitutableType *type) -> Type {