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

[CS] Sink closure attribute/param checking into applySolution

Browse Source 
The cases where CSApply fails should be fairly
limited these days, and there doesn't seem to be
any reason we shouldn't run these on failure anyway.
This commit is contained in:
Hamish Knight
2024-09-17 12:35:11 +01:00
parent 930dc18eb7
commit 1f79cbdca1
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Sema/CSApply.cpp
View File

@@ -8908,14 +8908,8 @@ namespace {
/// \returns true if an error occurred.
bool rewriteFunction(AnyFunctionRef fn) {
switch (Rewriter.cs.applySolution(fn, *this)) {
case SolutionApplicationToFunctionResult::Success: {
if (auto closure =
dyn_cast_or_null<ClosureExpr>(fn.getAbstractClosureExpr())) {
TypeChecker::checkClosureAttributes(closure);
TypeChecker::checkParameterList(closure->getParameters(), closure);
}
case SolutionApplicationToFunctionResult::Success:
return false;
}
case SolutionApplicationToFunctionResult::Failure:
return true;

3
lib/Sema/CSSyntacticElement.cpp
View File

@@ -2573,6 +2573,9 @@ ConstraintSystem::applySolution(AnyFunctionRef fn,
}
applySolutionToClosurePropertyWrappers(closure, solution);
TypeChecker::checkClosureAttributes(closure);
TypeChecker::checkParameterList(closure->getParameters(), closure);
}
// Enter the context of the function before performing any additional