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

Add a DeclContext Parameter to Opened Archetype Construction

Browse Source 
This ensures that opened archetypes always inherit any outer generic parameters from the context in which they reside. This matters because class bounds may bind generic parameters from these outer contexts, and without the outer context you can wind up with ill-formed generic environments like

<τ_0_0, where τ_0_0 : C<T>, τ_0_0 : P>

Where T is otherwise unbound because there is no entry for it among the generic parameters of the environment's associated generic signature.
This commit is contained in:
Robert Widmann
2022-03-02 18:08:31 -08:00
parent d166035dd8
commit d6186c9cfb
32 changed files with 228 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Sema/CSSimplify.cpp
View File

@@ -10120,7 +10120,8 @@ ConstraintSystem::simplifyOpenedExistentialOfConstraint(
instanceTy = metaTy->getExistentialInstanceType();
}
assert(instanceTy->isExistentialType());
Type openedTy = OpenedArchetypeType::get(instanceTy->getCanonicalType());
Type openedTy =
OpenedArchetypeType::get(instanceTy->getCanonicalType(), DC);
if (isMetatype)
openedTy = MetatypeType::get(openedTy, getASTContext());
return matchTypes(type1, openedTy, ConstraintKind::Bind, subflags, locator);
@@ -11119,7 +11120,7 @@ ConstraintSystem::simplifyApplicableFnConstraint(
if (result2->hasTypeVariable() && !openedExistentials.empty()) {
for (const auto &opened : openedExistentials) {
result2 = typeEraseOpenedExistentialReference(
result2, opened.second->getExistentialType(), opened.first);
result2, opened.second->getExistentialType(), opened.first, DC);
}
}