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 #21244 from jckarter/archetype-subclasses

Browse Source 
Split subclasses out of ArchetypeType.
This commit is contained in:
Joe Groff
2018-12-12 11:49:48 -08:00
committed by GitHub
parent fe1b75fe73 f1648a1b3e
commit 20a2f3ea9f
13 changed files with 295 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Sema/ConstraintSystem.cpp
View File

@@ -1020,7 +1020,7 @@ static void bindArchetypesFromContext(
ConstraintLocator *locatorPtr,
const OpenedTypeMap &replacements) {
auto bindContextArchetype = [&](Type paramTy, Type contextTy) {
auto bindPrimaryArchetype = [&](Type paramTy, Type contextTy) {
auto found = replacements.find(cast<GenericTypeParamType>(
paramTy->getCanonicalType()));
@@ -1044,7 +1044,7 @@ static void bindArchetypesFromContext(
if (parentDC != outerDC && parentDC->getSelfProtocolDecl()) {
auto selfTy = parentDC->getSelfInterfaceType();
auto contextTy = cs.TC.Context.TheUnresolvedType;
bindContextArchetype(selfTy, contextTy);
bindPrimaryArchetype(selfTy, contextTy);
}
continue;
}
@@ -1056,7 +1056,7 @@ static void bindArchetypesFromContext(
for (auto *paramTy : genericSig->getGenericParams()) {
Type contextTy = cs.DC->mapTypeIntoContext(paramTy);
bindContextArchetype(paramTy, contextTy);
bindPrimaryArchetype(paramTy, contextTy);
}
break;