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 #60521 from kavon/preconcurrency-var-access

Browse Source 
Add missing function conversion for member access to preconcurrency vardecl.
This commit is contained in:
swift-ci
2022-08-30 00:58:49 -07:00
committed by GitHub
parent 506ccccf74 a4d661d3bb
commit a66951aa3d
14 changed files with 198 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/Sema/ConstraintSystem.cpp
View File

@@ -1250,7 +1250,8 @@ ClosureIsolatedByPreconcurrency::operator()(const ClosureExpr *expr) const {
Type ConstraintSystem::getUnopenedTypeOfReference(
VarDecl *value, Type baseType, DeclContext *UseDC,
ConstraintLocator *memberLocator, bool wantInterfaceType) {
ConstraintLocator *memberLocator, bool wantInterfaceType,
bool adjustForPreconcurrency) {
return ConstraintSystem::getUnopenedTypeOfReference(
value, baseType, UseDC,
[&](VarDecl *var) -> Type {
@@ -1263,22 +1264,25 @@ Type ConstraintSystem::getUnopenedTypeOfReference(
return wantInterfaceType ? var->getInterfaceType() : var->getType();
},
memberLocator, wantInterfaceType, GetClosureType{*this},
memberLocator, wantInterfaceType, adjustForPreconcurrency,
GetClosureType{*this},
ClosureIsolatedByPreconcurrency{*this});
}
Type ConstraintSystem::getUnopenedTypeOfReference(
VarDecl *value, Type baseType, DeclContext *UseDC,
llvm::function_ref<Type(VarDecl *)> getType,
ConstraintLocator *memberLocator, bool wantInterfaceType,
ConstraintLocator *memberLocator,
bool wantInterfaceType, bool adjustForPreconcurrency,
llvm::function_ref<Type(const AbstractClosureExpr *)> getClosureType,
llvm::function_ref<bool(const ClosureExpr *)> isolatedByPreconcurrency) {
Type requestedType =
getType(value)->getWithoutSpecifierType()->getReferenceStorageReferent();
// Adjust the type for concurrency.
requestedType = adjustVarTypeForConcurrency(
requestedType, value, UseDC, getClosureType, isolatedByPreconcurrency);
// Adjust the type for concurrency if requested.
if (adjustForPreconcurrency)
requestedType = adjustVarTypeForConcurrency(
requestedType, value, UseDC, getClosureType, isolatedByPreconcurrency);
// If we're dealing with contextual types, and we referenced this type from
// a different context, map the type.
@@ -2302,9 +2306,14 @@ ConstraintSystem::getTypeOfMemberReference(
FunctionType::ExtInfo info;
refType = FunctionType::get(indices, elementTy, info);
} else {
// Delay the adjustment for preconcurrency until after we've formed
// the function type for this kind of reference. Otherwise we will lose
// track of the adjustment in the formed function's return type.
refType = getUnopenedTypeOfReference(cast<VarDecl>(value), baseTy, useDC,
locator,
/*wantInterfaceType=*/true);
/*wantInterfaceType=*/true,
/*adjustForPreconcurrency=*/false);
}
auto selfTy = outerDC->getSelfInterfaceType();
@@ -2425,6 +2434,16 @@ ConstraintSystem::getTypeOfMemberReference(
openedType = adjustFunctionTypeForConcurrency(
origOpenedType->castTo<AnyFunctionType>(), subscript, useDC,
/*numApplies=*/2, /*isMainDispatchQueue=*/false, replacements);
} else if (auto var = dyn_cast<VarDecl>(value)) {
// Adjust the function's result type, since that's the Var's actual type.
auto origFnType = origOpenedType->castTo<AnyFunctionType>();
auto resultTy = adjustVarTypeForConcurrency(
origFnType->getResult(), var, useDC, GetClosureType{*this},
ClosureIsolatedByPreconcurrency{*this});
openedType = FunctionType::get(
origFnType->getParams(), resultTy, origFnType->getExtInfo());
}
// Compute the type of the reference.