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

Merge pull request #76473 from hamishknight/attrick

Browse Source 
[CS] Call `checkParameterList` for single-expr closures
This commit is contained in:
Hamish Knight
2024-09-16 17:16:12 +01:00
committed by GitHub
parent 84e93a26ea b1c90feb52
commit c9c962bbd1
3 changed files with 57 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lib/Sema/CSApply.cpp
View File

@@ -8883,7 +8883,8 @@ namespace {
rewriteFunction(closure);
if (AnyFunctionRef(closure).hasExternalPropertyWrapperParameters()) {
return Action::SkipNode(rewriteClosure(closure));
return Action::SkipNode(Rewriter.buildSingleCurryThunk(
closure, closure, Rewriter.cs.getConstraintLocator(closure)));
}
return Action::SkipNode(closure);
@@ -8935,49 +8936,6 @@ namespace {
std::optional<SyntacticElementTarget>
rewriteTarget(SyntacticElementTarget target);
AutoClosureExpr *rewriteClosure(ClosureExpr *closure) {
auto &solution = Rewriter.solution;
// Apply types to synthesized property wrapper vars.
for (auto *param : *closure->getParameters()) {
if (!param->hasAttachedPropertyWrapper())
continue;
// Set the interface type of each property wrapper synthesized var
auto *backingVar = param->getPropertyWrapperBackingProperty();
auto backingType =
solution.simplifyType(solution.getType(backingVar))->mapTypeOutOfContext();
backingVar->setInterfaceType(backingType);
if (auto *projectionVar = param->getPropertyWrapperProjectionVar()) {
projectionVar->setInterfaceType(
solution.simplifyType(solution.getType(projectionVar))->mapTypeOutOfContext());
}
auto *wrappedValueVar = param->getPropertyWrapperWrappedValueVar();
auto wrappedValueType =
solution.simplifyType(solution.getType(wrappedValueVar))->mapTypeOutOfContext();
wrappedValueVar->setInterfaceType(wrappedValueType->getWithoutSpecifierType());
if (param->hasImplicitPropertyWrapper()) {
if (wrappedValueType->is<LValueType>())
wrappedValueVar->setImplInfo(StorageImplInfo::getMutableComputed());
// Add an explicit property wrapper attribute, which is needed for
// synthesizing the accessors.
auto &context = wrappedValueVar->getASTContext();
auto *typeExpr = TypeExpr::createImplicit(backingType, context);
auto *attr = CustomAttr::create(context, SourceLoc(), typeExpr, /*implicit=*/true);
wrappedValueVar->getAttrs().add(attr);
}
}
TypeChecker::checkParameterList(closure->getParameters(), closure);
return Rewriter.buildSingleCurryThunk(
closure, closure, Rewriter.cs.getConstraintLocator(closure));
}
/// Rewrite the function for the given solution.
///
/// \returns true if an error occurred.
@@ -8996,9 +8954,11 @@ namespace {
switch (result) {
case SolutionApplicationToFunctionResult::Success: {
if (auto closure = dyn_cast_or_null<ClosureExpr>(
fn.getAbstractClosureExpr()))
if (auto closure =
dyn_cast_or_null<ClosureExpr>(fn.getAbstractClosureExpr())) {
TypeChecker::checkClosureAttributes(closure);
TypeChecker::checkParameterList(closure->getParameters(), closure);
}
return false;
}

42
lib/Sema/CSSyntacticElement.cpp
View File

@@ -2523,6 +2523,46 @@ private:
};
} // namespace
static void applySolutionToClosurePropertyWrappers(ClosureExpr *closure,
const Solution &solution) {
for (auto *param : *closure->getParameters()) {
if (!param->hasAttachedPropertyWrapper())
continue;
// Set the interface type of each property wrapper synthesized var
auto *backingVar = param->getPropertyWrapperBackingProperty();
auto backingType = solution.simplifyType(solution.getType(backingVar))
->mapTypeOutOfContext();
backingVar->setInterfaceType(backingType);
if (auto *projectionVar = param->getPropertyWrapperProjectionVar()) {
projectionVar->setInterfaceType(
solution.simplifyType(solution.getType(projectionVar))
->mapTypeOutOfContext());
}
auto *wrappedValueVar = param->getPropertyWrapperWrappedValueVar();
auto wrappedValueType =
solution.simplifyType(solution.getType(wrappedValueVar))
->mapTypeOutOfContext();
wrappedValueVar->setInterfaceType(
wrappedValueType->getWithoutSpecifierType());
if (param->hasImplicitPropertyWrapper()) {
if (wrappedValueType->is<LValueType>())
wrappedValueVar->setImplInfo(StorageImplInfo::getMutableComputed());
// Add an explicit property wrapper attribute, which is needed for
// synthesizing the accessors.
auto &context = wrappedValueVar->getASTContext();
auto *typeExpr = TypeExpr::createImplicit(backingType, context);
auto *attr =
CustomAttr::create(context, SourceLoc(), typeExpr, /*implicit=*/true);
wrappedValueVar->getAttrs().add(attr);
}
}
}
SolutionApplicationToFunctionResult ConstraintSystem::applySolution(
Solution &solution, AnyFunctionRef fn,
DeclContext *&currentDC,
@@ -2553,6 +2593,8 @@ SolutionApplicationToFunctionResult ConstraintSystem::applySolution(
if (closure->hasExplicitResultType()) {
closure->setExplicitResultType(closureFnType->getResult());
}
applySolutionToClosurePropertyWrappers(closure, solution);
}
// Enter the context of the function before performing any additional

9
test/attr/closures.swift
View File

@@ -12,4 +12,13 @@ func testNonacceptedClosures() {
_ = fn
_ = fn2
// https://github.com/swiftlang/swift/issues/76291
_ = { (@objc x: Int) in 0 } // expected-error {{'@objc' attribute cannot be applied to this declaration}}
_ = { (@objc x: Int) in } // expected-error {{'@objc' attribute cannot be applied to this declaration}}
_ = { (@objc x: Int) in // expected-error {{'@objc' attribute cannot be applied to this declaration}}
print("hello")
return x
}
}