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 #27314 from CodaFi/an-interface-to-the-interface

Browse Source 
Requestify getInterfaceType() in Name Only
This commit is contained in:
Robert Widmann
2019-09-23 22:35:24 -07:00
committed by GitHub
parent b7f913063b 1233cdf596
commit 3e48f71b27
54 changed files with 205 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Sema/CSSimplify.cpp
View File

@@ -4701,7 +4701,8 @@ performMemberLookup(ConstraintKind constraintKind, DeclName memberName,
auto decl = candidate.getDecl();
// If the result is invalid, skip it.
TC.validateDecl(decl);
// FIXME(InterfaceTypeRequest): isInvalid() should be based on the interface type.
(void)decl->getInterfaceType();
if (decl->isInvalid()) {
result.markErrorAlreadyDiagnosed();
return;
@@ -5075,7 +5076,8 @@ performMemberLookup(ConstraintKind constraintKind, DeclName memberName,
auto *cand = entry.getValueDecl();
// If the result is invalid, skip it.
TC.validateDecl(cand);
// FIXME(InterfaceTypeRequest): isInvalid() should be based on the interface type.
(void)cand->getInterfaceType();
if (cand->isInvalid()) {
result.markErrorAlreadyDiagnosed();
return result;
@@ -7005,7 +7007,8 @@ ConstraintSystem::simplifyDynamicCallableApplicableFnConstraint(
// Record the 'dynamicallyCall` method overload set.
SmallVector<OverloadChoice, 4> choices;
for (auto candidate : candidates) {
TC.validateDecl(candidate);
// FIXME(InterfaceTypeRequest): isInvalid() should be based on the interface type.
(void)candidate->getInterfaceType();
if (candidate->isInvalid()) continue;
choices.push_back(
OverloadChoice(type2, candidate, FunctionRefKind::SingleApply));