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

[ConstraintSystem] Move @Sendable inference for global functions to adjustFunctionTypeForConcurrency

Browse Source
This commit is contained in:
Pavel Yaskevich
2024-03-20 11:04:19 -07:00
parent eb9755367c
commit 48e9684758
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Sema/ConstraintSystem.cpp
View File

@@ -1709,6 +1709,18 @@ FunctionType *ConstraintSystem::adjustFunctionTypeForConcurrency(
return openType(type, replacements, locator);
});
if (Context.LangOpts.hasFeature(Feature::InferSendableFromCaptures)) {
if (auto *FD = dyn_cast<AbstractFunctionDecl>(decl)) {
auto *DC = FD->getDeclContext();
// All global functions should be @Sendable
if (DC->isModuleScopeContext() &&
!adjustedTy->getExtInfo().isSendable()) {
adjustedTy =
adjustedTy->withExtInfo(adjustedTy->getExtInfo().withSendable());
}
}
}
return adjustedTy->castTo<FunctionType>();
}
@@ -1800,14 +1812,6 @@ ConstraintSystem::getTypeOfReference(ValueDecl *value,
auto numLabelsToRemove = getNumRemovedArgumentLabels(
funcDecl, /*isCurriedInstanceReference=*/false, functionRefKind);
if (Context.LangOpts.hasFeature(Feature::InferSendableFromCaptures)) {
// All global functions should be @Sendable
if (funcDecl->getDeclContext()->isModuleScopeContext()) {
funcType =
funcType->withExtInfo(funcType->getExtInfo().withSendable());
}
}
auto openedType = openFunctionType(funcType, locator, replacements,
funcDecl->getDeclContext())
->removeArgumentLabels(numLabelsToRemove);