Skip to content

[CSDiag] Remove nested type and use TC.isConvertible instead #17106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 12, 2018
Merged

[CSDiag] Remove nested type and use TC.isConvertible instead #17106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 3 additions & 42 deletions lib/Sema/CSDiag.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5474,47 +5474,7 @@ bool FailureDiagnosis::diagnoseSubscriptMisuse(ApplyExpr *callExpr) {
CalleeCandidateInfo candidateInfo(baseType, choices,
callArgHasTrailingClosure(argExpr),
CS, true);
struct TypeConvertibleChecker {
ConstraintSystem &CS;

TypeConvertibleChecker(ConstraintSystem &CS) : CS(CS) {}

// Checks whether type1 is implicitly convertible to type2
bool isImplicitlyConvertible(Type type1, Type type2) {
if (!type1 || !type2)
return false;

if (auto tup1 = type1->getAs<TupleType>()) {
if (auto tup2 = type2->getAs<TupleType>())
return isImplicitlyConvertibleTuple(tup1, tup2);
else
return false;
}
if (type1->isEqual(type2) || type2->is<GenericTypeParamType>() ||
CS.TC.isSubtypeOf(type1, type2, CS.DC))
return true;
return false;
}

bool isImplicitlyConvertibleTuple(TupleType *tup1, TupleType *tup2) {
if (tup1->getNumElements() != tup2->getNumElements())
return false;

for (unsigned i = 0, e = tup1->getNumElements(); i < e; i ++) {
auto element1 = tup1->getElement(i);
auto element2 = tup2->getElement(i);
if (element1.hasName()) {
if (!element2.hasName() || element1.getName() !=
element2.getName())
return false;
}
if (!isImplicitlyConvertible(element1.getType(),
element2.getType()))
return false;
}
return true;
}
} checker(CS);
auto params = swift::decomposeArgType(CS.getType(argExpr), argLabels);
using ClosenessPair = CalleeCandidateInfo::ClosenessResultTy;

Expand All @@ -5528,8 +5488,9 @@ bool FailureDiagnosis::diagnoseSubscriptMisuse(ApplyExpr *callExpr) {
return {CC_GeneralMismatch, {}};

for (unsigned i = 0, e = params.size(); i < e; i ++) {
if (checker.isImplicitlyConvertible(params[i].getType(),
candParams[i].getType()))
if (CS.TC.isConvertibleTo(params[i].getType(),
candParams[i].getType(), CS.DC) ||
candParams[i].getType()->is<GenericTypeParamType>())
continue;
return {CC_GeneralMismatch, {}};
}
Expand Down