Skip to content

Commit dd46c88

Browse files
committed
Fixup calls to TypeChecker::checkGenericArguments
1 parent da95db4 commit dd46c88

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

lib/Sema/TypeCheckProtocol.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3693,7 +3693,7 @@ void ConformanceChecker::ensureRequirementsAreSatisfied() {
36933693
}
36943694
} listener(Conformance, fileForCheckingExportability);
36953695

3696-
auto result = TC.checkGenericArguments(
3696+
auto result = TypeChecker::checkGenericArguments(
36973697
DC, Loc, Loc,
36983698
// FIXME: maybe this should be the conformance's type
36993699
proto->getDeclaredInterfaceType(),

lib/Sema/TypeCheckProtocolInference.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,13 +1102,13 @@ bool AssociatedTypeInference::checkCurrentTypeWitnesses(
11021102
sanitizeProtocolRequirements(proto, proto->getRequirementSignature(),
11031103
sanitizedRequirements);
11041104
auto result =
1105-
tc.checkGenericArguments(dc, SourceLoc(), SourceLoc(),
1106-
typeInContext,
1107-
{ proto->getSelfInterfaceType() },
1108-
sanitizedRequirements,
1109-
QuerySubstitutionMap{substitutions},
1110-
TypeChecker::LookUpConformance(dc),
1111-
None, nullptr, options);
1105+
TypeChecker::checkGenericArguments(dc, SourceLoc(), SourceLoc(),
1106+
typeInContext,
1107+
{ proto->getSelfInterfaceType() },
1108+
sanitizedRequirements,
1109+
QuerySubstitutionMap{substitutions},
1110+
TypeChecker::LookUpConformance(dc),
1111+
None, nullptr, options);
11121112
switch (result) {
11131113
case RequirementCheckResult::Failure:
11141114
++NumSolutionStatesFailedCheck;
@@ -1150,7 +1150,7 @@ bool AssociatedTypeInference::checkConstrainedExtension(ExtensionDecl *ext) {
11501150
auto subs = typeInContext->getContextSubstitutions(ext);
11511151

11521152
SubstOptions options = getSubstOptionsWithCurrentTypeWitnesses();
1153-
switch (tc.checkGenericArguments(
1153+
switch (TypeChecker::checkGenericArguments(
11541154
dc, SourceLoc(), SourceLoc(), adoptee,
11551155
ext->getGenericSignature()->getGenericParams(),
11561156
ext->getGenericSignature()->getRequirements(),

0 commit comments

Comments
 (0)