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

Sema: Refactor 'single Any parameter' hack a bit

Browse Source 
It should be a no-op to remove it entirely but it has an effect
on ranking I don't understand. Refactor it in preparation for
changing matchCallArguments() to work on parameter lists instead
of types.
This commit is contained in:
Slava Pestov
2018-08-28 21:35:45 -07:00
parent 59827da70f
commit fb77bb4eb7
1 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
lib/Sema/CSSimplify.cpp
View File

@@ -759,20 +759,35 @@ ConstraintSystem::TypeMatchResult
constraints::matchCallArguments(ConstraintSystem &cs, bool isOperator,
Type argType, Type paramType,
ConstraintLocatorBuilder locator) {
// Extract the parameters.
ValueDecl *callee;
unsigned calleeLevel;
ArrayRef<Identifier> argLabels;
SmallVector<Identifier, 2> argLabelsScratch;
bool hasTrailingClosure = false;
std::tie(callee, calleeLevel, argLabels, hasTrailingClosure) =
getCalleeDeclAndArgs(cs, locator, argLabelsScratch);
if (paramType->isAny()) {
if (argType->is<InOutType>())
return cs.getTypeMatchFailure(locator);
SmallVector<AnyFunctionType::Param, 4> params;
AnyFunctionType::decomposeInput(paramType, params);
// If the param type is Any, the function can only have one argument.
// Check if exactly one argument was passed to this function, otherwise
// we obviously have a mismatch.
if (auto tupleArgType = dyn_cast<TupleType>(argType.getPointer())) {
if (tupleArgType->getNumElements() != 1 ||
tupleArgType->getElement(0).hasName()) {
return cs.getTypeMatchFailure(locator);
}
}
llvm::SmallBitVector defaultMap =
computeDefaultMap(params, callee, calleeLevel);
// Extract the arguments.
auto args = decomposeArgType(argType, argLabels);
// FIXME: Remove this. It's functionally identical to the real code
// path below, except for some behavioral differences in solution ranking
// that I don't understand.
if (params.size() == 1 &&
args.size() == 1 &&
params[0].getLabel().empty() &&
args[0].getLabel().empty() &&
!params[0].getParameterFlags().isInOut() &&
!args[0].getParameterFlags().isInOut() &&
params[0].getPlainType()->isAny()) {
auto argType = args[0].getPlainType();
// Disallow assignment of noescape function to parameter of type
// Any. Allowing this would allow these functions to escape.
@@ -792,24 +807,6 @@ constraints::matchCallArguments(ConstraintSystem &cs, bool isOperator,
return cs.getTypeMatchSuccess();
}
// Extract the parameters.
ValueDecl *callee;
unsigned calleeLevel;
ArrayRef<Identifier> argLabels;
SmallVector<Identifier, 2> argLabelsScratch;
bool hasTrailingClosure = false;
std::tie(callee, calleeLevel, argLabels, hasTrailingClosure) =
getCalleeDeclAndArgs(cs, locator, argLabelsScratch);
SmallVector<AnyFunctionType::Param, 4> params;
AnyFunctionType::decomposeInput(paramType, params);
llvm::SmallBitVector defaultMap =
computeDefaultMap(params, callee, calleeLevel);
// Extract the arguments.
auto args = decomposeArgType(argType, argLabels);
// Match up the call arguments to the parameters.
ArgumentFailureTracker listener(cs, locator);
SmallVector<ParamBinding, 4> parameterBindings;