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 #23077 from DougGregor/revert-common-type

Browse Source
This commit is contained in:
swift-ci
2019-03-04 17:04:47 -08:00
committed by GitHub
parent 98687b1341 a13ba3b8b9
commit 5ec8f96fd3
4 changed files with 40 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
lib/Sema/CSSimplify.cpp
View File

@@ -131,12 +131,47 @@ bool constraints::areConservativelyCompatibleArgumentLabels(
hasCurriedSelf = false;
} else if (baseType->is<AnyMetatypeType>() && decl->isInstanceMember()) {
hasCurriedSelf = false;
} else if (isa<EnumElementDecl>(decl)) {
hasCurriedSelf = false;
} else {
hasCurriedSelf = true;
}
return areConservativelyCompatibleArgumentLabels(
decl, hasCurriedSelf, labels, hasTrailingClosure);
const AnyFunctionType *fTy;
if (auto fn = dyn_cast<AbstractFunctionDecl>(decl)) {
fTy = fn->getInterfaceType()->castTo<AnyFunctionType>();
} else if (auto subscript = dyn_cast<SubscriptDecl>(decl)) {
assert(!hasCurriedSelf && "Subscripts never have curried 'self'");
fTy = subscript->getInterfaceType()->castTo<AnyFunctionType>();
} else if (auto enumElement = dyn_cast<EnumElementDecl>(decl)) {
fTy = enumElement->getInterfaceType()->castTo<AnyFunctionType>();
} else {
return true;
}
SmallVector<AnyFunctionType::Param, 8> argInfos;
for (auto argLabel : labels) {
argInfos.push_back(AnyFunctionType::Param(Type(), argLabel, {}));
}
const AnyFunctionType *levelTy = fTy;
if (hasCurriedSelf) {
levelTy = levelTy->getResult()->getAs<AnyFunctionType>();
assert(levelTy && "Parameter list curry level does not match type");
}
auto params = levelTy->getParams();
SmallBitVector defaultMap =
computeDefaultMap(params, decl, hasCurriedSelf);
MatchCallArgumentListener listener;
SmallVector<ParamBinding, 8> unusedParamBindings;
return !matchCallArguments(argInfos, params, defaultMap,
hasTrailingClosure,
/*allow fixes*/ false,
listener, unusedParamBindings);
}
Expr *constraints::getArgumentLabelTargetExpr(Expr *fn) {
@@ -158,46 +193,6 @@ Expr *constraints::getArgumentLabelTargetExpr(Expr *fn) {
} while (true);
}
bool constraints::
areConservativelyCompatibleArgumentLabels(ValueDecl *decl,
bool hasCurriedSelf,
ArrayRef<Identifier> labels,
bool hasTrailingClosure) {
const AnyFunctionType *fTy;
if (auto fn = dyn_cast<AbstractFunctionDecl>(decl)) {
fTy = fn->getInterfaceType()->castTo<AnyFunctionType>();
} else if (auto subscript = dyn_cast<SubscriptDecl>(decl)) {
assert(!hasCurriedSelf && "Subscripts never have curried 'self'");
fTy = subscript->getInterfaceType()->castTo<AnyFunctionType>();
} else {
return true;
}
SmallVector<AnyFunctionType::Param, 8> argInfos;
for (auto argLabel : labels) {
argInfos.push_back(AnyFunctionType::Param(Type(), argLabel, {}));
}
const AnyFunctionType *levelTy = fTy;
if (hasCurriedSelf) {
levelTy = levelTy->getResult()->getAs<AnyFunctionType>();
assert(levelTy && "Parameter list curry level does not match type");
}
auto params = levelTy->getParams();
SmallBitVector defaultMap =
computeDefaultMap(params, decl, hasCurriedSelf);
MatchCallArgumentListener listener;
SmallVector<ParamBinding, 8> unusedParamBindings;
return !matchCallArguments(argInfos, params, defaultMap,
hasTrailingClosure,
/*allow fixes*/ false,
listener, unusedParamBindings);
}
/// Determine the default type-matching options to use when decomposing a
/// constraint into smaller constraints.
static ConstraintSystem::TypeMatchOptions getDefaultDecompositionOptions(