averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ConstraintSystem] Switch to use AnyFunctionType::getParams() instead of getInput()

Browse Source
This commit is contained in:
Pavel Yaskevich
2018-04-10 20:26:47 -07:00
parent 02b2aa7485
commit 4baeec8965
2 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
lib/Sema/ConstraintSystem.cpp
View File

@@ -534,20 +534,15 @@ static Type removeArgumentLabels(Type type, unsigned numArgumentLabels) {
auto fnType = type->getAs<FunctionType>();
// Drop argument labels from the input type.
Type inputType = fnType->getInput();
if (auto tupleTy = dyn_cast<TupleType>(inputType.getPointer())) {
SmallVector<TupleTypeElt, 4> elements;
elements.reserve(tupleTy->getNumElements());
for (const auto &elt : tupleTy->getElements()) {
elements.push_back(elt.getWithoutName());
}
inputType = TupleType::get(elements, type->getASTContext());
}
llvm::SmallVector<AnyFunctionType::Param, 4> unlabeledParams;
unlabeledParams.reserve(fnType->getNumParams());
for (const auto &param : fnType->getParams())
unlabeledParams.push_back(param.getWithoutLabel());
return FunctionType::get(inputType,
removeArgumentLabels(fnType->getResult(),
numArgumentLabels - 1),
fnType->getExtInfo());
return FunctionType::get(
unlabeledParams,
removeArgumentLabels(fnType->getResult(), numArgumentLabels - 1),
fnType->getExtInfo());
}
Type ConstraintSystem::openFunctionType(
@@ -569,14 +564,21 @@ Type ConstraintSystem::openFunctionType(
locator,
replacements);
// Transform the input and output types.
auto inputTy = openType(genericFn->getInput(), replacements);
// Transform the parameters and output type.
llvm::SmallVector<AnyFunctionType::Param, 4> openedParams;
openedParams.reserve(genericFn->getNumParams());
for (const auto &param : genericFn->getParams()) {
auto type = openType(param.getPlainType(), replacements);
openedParams.push_back(AnyFunctionType::Param(type, param.getLabel(),
param.getParameterFlags()));
}
auto resultTy = openType(genericFn->getResult(), replacements);
// Build the resulting (non-generic) function type.
funcType = FunctionType::get(inputTy, resultTy,
FunctionType::ExtInfo().
withThrows(genericFn->throws()));
funcType = FunctionType::get(
openedParams, resultTy,
FunctionType::ExtInfo().withThrows(genericFn->throws()));
}
return removeArgumentLabels(funcType, numArgumentLabelsToRemove);
@@ -897,7 +899,9 @@ ConstraintSystem::getTypeOfReference(ValueDecl *value,
// DynamicSelf with the actual object type.
if (!func->getDeclContext()->getAsProtocolOrProtocolExtensionContext()) {
if (func->hasDynamicSelf()) {
Type selfTy = openedFnType->getInput()->getRValueInstanceType();
auto params = openedFnType->getParams();
assert(params.size() == 1);
Type selfTy = params.front().getType()->getRValueInstanceType();
openedType = openedType->replaceCovariantResultType(
selfTy,
func->getNumParameterLists());
@@ -1358,7 +1362,10 @@ ConstraintSystem::getTypeOfMemberReference(
// Constrain the 'self' object type.
auto openedFnType = openedType->castTo<FunctionType>();
Type selfObjTy = openedFnType->getInput()->getRValueInstanceType();
auto openedParams = openedFnType->getParams();
assert(openedParams.size() == 1);
Type selfObjTy = openedParams.front().getType()->getRValueInstanceType();
if (outerDC->getAsProtocolOrProtocolExtensionContext()) {
// For a protocol, substitute the base object directly. We don't need a
// conformance constraint because we wouldn't have found the declaration
@@ -1887,10 +1894,8 @@ void ConstraintSystem::resolveOverload(ConstraintLocator *locator,
if (boundFunctionType &&
CD->hasThrows() != boundFunctionType->throws()) {
boundType = FunctionType::get(boundFunctionType->getInput(),
boundFunctionType->getResult(),
boundFunctionType->getExtInfo().
withThrows());
boundType = boundFunctionType->withExtInfo(
boundFunctionType->getExtInfo().withThrows());
}
}
}