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

RequirementMachine: Move protocol linear order from ProtocolGraph to RewriteContext

Browse Source
This commit is contained in:
Slava Pestov
2021-10-21 18:58:18 -04:00
parent 941438d6c8
commit 0571b65cb8
16 changed files with 207 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/AST/RequirementMachine/PropertyUnification.cpp
View File

@@ -501,7 +501,7 @@ void PropertyMap::concretizeNestedTypesFromConcreteParent(
// PropertyBag::getConformsToExcludingSuperclassConformances().
conformances.push_back(concrete);
auto assocTypes = Protos.getProtocolInfo(proto).AssociatedTypes;
auto assocTypes = proto->getAssociatedTypeMembers();
if (assocTypes.empty())
continue;
@@ -543,7 +543,7 @@ void PropertyMap::concretizeNestedTypesFromConcreteParent(
auto term = Context.getRelativeTermForType(t->getCanonicalType(),
substitutions);
System.simplify(term);
return Context.getTypeForTerm(term, { }, Protos);
return Context.getTypeForTerm(term, { });
}));
};