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

[SR-12239] Adjusting ambiguit check to use solution argument binding to map arg to param

Browse Source
This commit is contained in:
Luciano Almeida
2021-06-16 20:19:15 -03:00
parent 2e4ea3b94c
commit 1903681554
1 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/Sema/ConstraintSystem.cpp
View File

@@ -3761,24 +3761,31 @@ static bool diagnoseContextualFunctionCallGenericAmbiguity(
if (!GP)
return false;
auto typeParamResultInvolvesTypeVar =
[&cs, &applyFnType](unsigned paramIdx, TypeVariableType *typeVar) {
assert(paramIdx < applyFnType->getNumParams());
auto param = applyFnType->getParams()[paramIdx];
if (param.isVariadic()) {
auto paramType = param.getParameterType();
// Variadic parameter is constructed as an ArraySliceType(which is
// just sugared type for a bound generic) with the closure type as
// element.
auto baseType =
paramType->getDesugaredType()->castTo<BoundGenericType>();
auto paramFnType =
baseType->getGenericArgs()[0]->castTo<FunctionType>();
return cs.typeVarOccursInType(typeVar, paramFnType->getResult());
}
auto paramFnType = param.getParameterType()->castTo<FunctionType>();
return cs.typeVarOccursInType(typeVar, paramFnType->getResult());
};
auto applyLoc =
cs.getConstraintLocator(AE, {LocatorPathElt::ApplyArgument()});
auto argMatching =
contextualFix.first->argumentMatchingChoices.find(applyLoc);
if (argMatching == contextualFix.first->argumentMatchingChoices.end()) {
return false;
}
auto typeParamResultInvolvesTypeVar = [&cs, &applyFnType, &argMatching](
unsigned argIdx,
TypeVariableType *typeVar) {
auto argParamMatch = argMatching->second.parameterBindings[argIdx];
auto param = applyFnType->getParams()[argParamMatch.front()];
if (param.isVariadic()) {
auto paramType = param.getParameterType();
// Variadic parameter is constructed as an ArraySliceType(which is
// just sugared type for a bound generic) with the closure type as
// element.
auto baseType = paramType->getDesugaredType()->castTo<BoundGenericType>();
auto paramFnType = baseType->getGenericArgs()[0]->castTo<FunctionType>();
return cs.typeVarOccursInType(typeVar, paramFnType->getResult());
}
auto paramFnType = param.getParameterType()->castTo<FunctionType>();
return cs.typeVarOccursInType(typeVar, paramFnType->getResult());
};
llvm::SmallVector<ClosureExpr *, 4> closureArguments;
// A single closure argument.