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 #14100 from xedin/rdar-36449760

Browse Source 
[ConstraintSystem] Bind Self to correct contextual type for nested types in protocol
This commit is contained in:
Pavel Yaskevich
2018-01-25 00:57:41 -08:00
committed by GitHub
parent 6e3d980e7e a11263b156
commit 261ffe4d5c
2 changed files with 75 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/Sema/ConstraintSystem.cpp
View File

@@ -954,6 +954,29 @@ ConstraintSystem::getTypeOfReference(ValueDecl *value,
return { valueType, valueType };
}
static NominalTypeDecl *getInnermostConformingDC(TypeChecker &TC,
DeclContext *DC,
ProtocolDecl *protocol) {
do {
if (DC->isTypeContext()) {
auto *NTD = DC->getAsNominalTypeOrNominalTypeExtensionContext();
auto type = NTD->getDeclaredType();
ConformanceCheckOptions options;
options |= ConformanceCheckFlags::InExpression;
options |= ConformanceCheckFlags::SuppressDependencyTracking;
options |= ConformanceCheckFlags::SkipConditionalRequirements;
auto result =
TC.conformsToProtocol(type, protocol, NTD->getDeclContext(), options);
if (result)
return NTD;
}
} while ((DC = DC->getParent()));
return nullptr;
}
/// Bind type variables for archetypes that are determined from
/// context.
///
@@ -1015,8 +1038,18 @@ static void bindArchetypesFromContext(
// parameters, or because this generic parameter was constrained
// away into a concrete type.
if (found != replacements.end()) {
Type contextTy;
if (genericEnv) {
contextTy = genericEnv->mapTypeIntoContext(paramTy);
} else {
auto *protocol = parentDC->getAsProtocolOrProtocolExtensionContext();
auto conformingDC = getInnermostConformingDC(cs.TC, cs.DC, protocol);
assert(conformingDC);
contextTy = conformingDC->getDeclaredTypeInContext();
}
auto typeVar = found->second;
auto contextTy = genericEnv->mapTypeIntoContext(paramTy);
cs.addConstraint(ConstraintKind::Bind, typeVar, contextTy,
locatorPtr);
}