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

[AST] NFC: Make ExtInfo param Optional<>

Browse Source 
While it is very convenient to default the ExtInfo state when creating
new function types, it also make the intent unclear to those looking to
extend ExtInfo state. For example, did a given call site intend to have
the default ExtInfo state or does it just happen to work? This matters a
lot because function types are regularly unpacked and rebuilt and it's
really easy to accidentally drop ExtInfo state.

By changing the ExtInfo state to an optional, we can track when it is
actually needed.
This commit is contained in:
David Zarzycki
2021-03-03 10:20:56 -05:00
parent aa74b1bbe0
commit c0ec6c3235
23 changed files with 392 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/Sema/ConstraintSystem.cpp
View File

@@ -1597,7 +1597,9 @@ ConstraintSystem::getTypeOfMemberReference(
auto indices = subscript->getInterfaceType()
->castTo<AnyFunctionType>()->getParams();
refType = FunctionType::get(indices, elementTy);
// FIXME: Verify ExtInfo state is correct, not working by accident.
FunctionType::ExtInfo info;
refType = FunctionType::get(indices, elementTy, info);
} else {
refType =
getUnopenedTypeOfReference(cast<VarDecl>(value), baseTy, useDC, base,
@@ -1618,10 +1620,13 @@ ConstraintSystem::getTypeOfMemberReference(
// If the storage is generic, add a generic signature.
FunctionType::Param selfParam(selfTy, Identifier(), selfFlags);
// FIXME: Verify ExtInfo state is correct, not working by accident.
if (auto sig = innerDC->getGenericSignatureOfContext()) {
funcType = GenericFunctionType::get(sig, {selfParam}, refType);
GenericFunctionType::ExtInfo info;
funcType = GenericFunctionType::get(sig, {selfParam}, refType, info);
} else {
funcType = FunctionType::get({selfParam}, refType);
FunctionType::ExtInfo info;
funcType = FunctionType::get({selfParam}, refType, info);
}
}
@@ -1697,7 +1702,10 @@ ConstraintSystem::getTypeOfMemberReference(
auto *functionType = fullFunctionType->getResult()->getAs<FunctionType>();
functionType = unwrapPropertyWrapperParameterTypes(*this, funcDecl, functionRefKind,
functionType, locator);
openedType = FunctionType::get(fullFunctionType->getParams(), functionType);
// FIXME: Verify ExtInfo state is correct, not working by accident.
FunctionType::ExtInfo info;
openedType =
FunctionType::get(fullFunctionType->getParams(), functionType, info);
}
// Compute the type of the reference.
@@ -1864,7 +1872,9 @@ Type ConstraintSystem::getEffectiveOverloadType(const OverloadChoice &overload,
auto indices = subscript->getInterfaceType()
->castTo<AnyFunctionType>()->getParams();
type = FunctionType::get(indices, elementTy);
// FIXME: Verify ExtInfo state is correct, not working by accident.
FunctionType::ExtInfo info;
type = FunctionType::get(indices, elementTy, info);
} else if (auto var = dyn_cast<VarDecl>(decl)) {
type = var->getValueInterfaceType();
if (doesStorageProduceLValue(var, overload.getBaseType(), useDC))
@@ -1975,7 +1985,9 @@ static std::pair<Type, Type> getTypeOfReferenceWithSpecialTypeCheckingSemantics(
CS.addConstraint(
ConstraintKind::DynamicTypeOf, output, input,
CS.getConstraintLocator(locator, ConstraintLocator::DynamicType));
auto refType = FunctionType::get({inputArg}, output);
// FIXME: Verify ExtInfo state is correct, not working by accident.
FunctionType::ExtInfo info;
auto refType = FunctionType::get({inputArg}, output, info);
return {refType, refType};
}
case DeclTypeCheckingSemantics::WithoutActuallyEscaping: {
@@ -2644,8 +2656,10 @@ void ConstraintSystem::bindOverloadType(
ConstraintLocator::FunctionResult),
TVO_CanBindToLValue | TVO_CanBindToNoEscape);
// FIXME: Verify ExtInfo state is correct, not working by accident.
FunctionType::ExtInfo info;
auto adjustedFnTy =
FunctionType::get(fnType->getParams(), subscriptResultTy);
FunctionType::get(fnType->getParams(), subscriptResultTy, info);
ConstraintLocatorBuilder kpLocBuilder(keyPathLoc);
addConstraint(
@@ -2802,10 +2816,14 @@ void ConstraintSystem::resolveOverload(ConstraintLocator *locator,
FunctionType::Param indices[] = {
FunctionType::Param(keyPathIndexTy, getASTContext().Id_keyPath),
};
auto subscriptTy = FunctionType::get(indices, elementTy);
// FIXME: Verify ExtInfo state is correct, not working by accident.
FunctionType::ExtInfo subscriptInfo;
auto subscriptTy = FunctionType::get(indices, elementTy, subscriptInfo);
FunctionType::Param baseParam(choice.getBaseType());
auto fullTy = FunctionType::get({baseParam}, subscriptTy);
// FIXME: Verify ExtInfo state is correct, not working by accident.
FunctionType::ExtInfo fullInfo;
auto fullTy = FunctionType::get({baseParam}, subscriptTy, fullInfo);
openedFullType = fullTy;
refType = subscriptTy;