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

Add support for opaque result types in structural positions (#38392)

Browse Source 
* [TypeResolver][TypeChecker] Add support for structural opaque result types

* [TypeResolver][TypeChecker] Clean up changes that add structural opaque result types
This commit is contained in:
willtunnels
2021-08-03 23:45:02 -04:00
committed by GitHub
parent f85d496550
commit 319b3e64aa
34 changed files with 569 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
lib/Sema/ConstraintSystem.cpp
View File

@@ -844,6 +844,44 @@ Type ConstraintSystem::openType(Type type, OpenedTypeMap &replacements) {
});
}
Type ConstraintSystem::openOpaqueType(Type type,
ConstraintLocatorBuilder locator) {
auto opaque = type->castTo<OpaqueTypeArchetypeType>();
auto opaqueLocator = locator.withPathElement(
LocatorPathElt::OpenedOpaqueArchetype(opaque->getDecl()));
// Open the generic signature of the opaque decl, and bind the "outer" generic
// params to our context. The remaining axes of freedom on the type variable
// corresponding to the underlying type should be the constraints on the
// underlying return type.
OpenedTypeMap replacements;
openGeneric(DC, opaque->getBoundSignature(), opaqueLocator, replacements);
auto underlyingTyVar = openType(opaque->getInterfaceType(), replacements);
assert(underlyingTyVar);
for (auto param : DC->getGenericSignatureOfContext().getGenericParams()) {
addConstraint(ConstraintKind::Bind, openType(param, replacements),
DC->mapTypeIntoContext(param), opaqueLocator);
}
return underlyingTyVar;
}
Type ConstraintSystem::openOpaqueTypeRec(Type type,
ConstraintLocatorBuilder locator) {
// Early return if `type` is `NULL` or if there are no opaque archetypes (in
// which case there is certainly nothing for us to do).
if (!type || !type->hasOpaqueArchetype())
return type;
return type.transform([&](Type type) -> Type {
if (type->is<OpaqueTypeArchetypeType>())
return openOpaqueType(type, locator);
return type;
});
}
FunctionType *ConstraintSystem::openFunctionType(
AnyFunctionType *funcType,
ConstraintLocatorBuilder locator,
@@ -5379,23 +5417,11 @@ bool SolutionApplicationTarget::infersOpaqueReturnType() const {
assert(kind == Kind::expression);
switch (expression.contextualPurpose) {
case CTP_Initialization:
if (Type convertType = expression.convertType.getType()) {
return convertType->is<OpaqueTypeArchetypeType>();
}
return false;
case CTP_ReturnStmt:
case CTP_ReturnSingleExpr:
if (Type convertType = expression.convertType.getType()) {
if (auto opaqueType = convertType->getAs<OpaqueTypeArchetypeType>()) {
auto dc = getDeclContext();
if (auto func = dyn_cast<AbstractFunctionDecl>(dc)) {
return opaqueType->getDecl()->isOpaqueReturnTypeOfFunction(func);
}
}
}
if (Type convertType = expression.convertType.getType())
return convertType->hasOpaqueArchetype();
return false;
default:
return false;
}