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

Merge pull request #28275 from slavapestov/check-where-clause-non-generic-type

Browse Source 
Check generic requirements of parent context when realizing non-generic types
This commit is contained in:
Slava Pestov
2019-11-15 08:46:04 -05:00
committed by GitHub
parent 0b6ef0d4d1 0e06792642
commit 9826aaa9ed
9 changed files with 224 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Sema/ConstraintSystem.cpp
View File

@@ -677,8 +677,6 @@ Type ConstraintSystem::openUnboundGenericType(
Type type, ConstraintLocatorBuilder locator) {
assert(!type->getCanonicalType()->hasTypeParameter());
checkNestedTypeConstraints(*this, type, locator);
if (!type->hasUnboundGenericType())
return type;
@@ -1036,6 +1034,8 @@ ConstraintSystem::getTypeOfReference(ValueDecl *value,
TypeResolverContext::InExpression,
/*isSpecialized=*/false);
checkNestedTypeConstraints(*this, type, locator);
// Open the type.
type = openUnboundGenericType(type, locator);
@@ -1289,6 +1289,9 @@ ConstraintSystem::getTypeOfMemberReference(
auto memberTy = TypeChecker::substMemberTypeWithBase(DC->getParentModule(),
typeDecl, baseObjTy);
checkNestedTypeConstraints(*this, memberTy, locator);
// Open the type if it was a reference to a generic type.
memberTy = openUnboundGenericType(memberTy, locator);