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

SIL: Pass SubstFlags::PreservePackExpansionLevel in a few places

Browse Source 
Fixes rdar://problem/111219086.
This commit is contained in:
Slava Pestov
2023-06-23 23:26:38 -04:00
parent 1646085ba7
commit 61f4d6f65d
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/swift/SIL/SILCloner.h
View File

@@ -195,9 +195,9 @@ public:
if (Subs.hasLocalArchetypes()) {
// If we found a type containing a local archetype, substitute
// open existentials throughout the substitution map.
Subs = Subs.subst(QueryTypeSubstitutionMapOrIdentity{
LocalArchetypeSubs},
MakeAbstractConformanceForGenericType());
Subs = Subs.subst(QueryTypeSubstitutionMapOrIdentity{LocalArchetypeSubs},
MakeAbstractConformanceForGenericType(),
SubstFlags::PreservePackExpansionLevel);
}
}
@@ -220,7 +220,9 @@ public:
return Ty.subst(
Builder.getModule(),
QueryTypeSubstitutionMapOrIdentity{LocalArchetypeSubs},
MakeAbstractConformanceForGenericType());
MakeAbstractConformanceForGenericType(),
CanGenericSignature(),
SubstFlags::PreservePackExpansionLevel);
}
SILType getOpType(SILType Ty) {
Ty = getTypeInClonedContext(Ty);
@@ -239,7 +241,8 @@ public:
return ty.subst(
QueryTypeSubstitutionMapOrIdentity{LocalArchetypeSubs},
MakeAbstractConformanceForGenericType()
MakeAbstractConformanceForGenericType(),
SubstFlags::PreservePackExpansionLevel
)->getCanonicalType();
}
@@ -352,7 +355,8 @@ public:
conformance.subst(ty,
QueryTypeSubstitutionMapOrIdentity{
LocalArchetypeSubs},
MakeAbstractConformanceForGenericType());
MakeAbstractConformanceForGenericType(),
SubstFlags::PreservePackExpansionLevel);
}
return asImpl().remapConformance(getASTTypeInClonedContext(ty),