Sema: Small fixes for result builder inference #76749
Open
+875
−257
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AnthonyLatsis
requested review from
hborla,
xedin and
slavapestov
as code owners
|
@swift-ci please smoke test Linux |
xedin
approved these changes
Sep 27, 2024
AnthonyLatsis
force-pushed
the
amanita-muscaria
branch
from
37c326a
to
66d4cd1
Compare
|
@swift-ci please smoke test Linux |
…look at getter, not storage
A callback enables the caller to control whether to abort the walk. This is handy for `BraceHasExplicitReturnStmtRequest`.
… `BraceStmt` Also rename it to `getExplicitReturnStmts` for clarity and have it take a `SmallVector` out parameter instead as a small optimization and to discourage use of this new method as an alternative to `BraceStmt::hasExplicitReturnStatement`.
AnthonyLatsis
force-pushed
the
amanita-muscaria
branch
from
66d4cd1
to
02665c5
Compare
|
@swift-ci please smoke test Linux |
|
@swift-ci please test source compatibility release |
hamishknight
approved these changes
Sep 29, 2024
| @@ -468,8 +468,7 @@ void typeCheckASTNode(ASTNode &node, DeclContext *DC, | |||
| std::optional<BraceStmt *> applyResultBuilderBodyTransform(FuncDecl *func, | |||
| Type builderType); | |||
|
|
|||
| /// Find the return statements within the body of the given function. | |||
| std::vector<ReturnStmt *> findReturnStatements(AnyFunctionRef fn); | |||
| bool typeCheckClosureBody(ClosureExpr *closure); | |||
There was a problem hiding this comment.
Bad rebase? This function doesn't exist anymore
| @@ -1126,8 +1124,7 @@ ConstraintSystem::matchResultBuilder(AnyFunctionRef fn, Type builderType, | |||
| // not apply the result builder transform if it contained an explicit return. | |||
| // To maintain source compatibility, we still need to check for HasReturnStmt. | |||
| // https://github.com/apple/swift/issues/64332. | |||
| if (evaluateOrDefault(getASTContext().evaluator, | |||
| BraceHasReturnRequest{fn.getBody()}, false)) { | |||
| if (fn.getBody()->hasExplicitReturnStmt(getASTContext())) { | |||
There was a problem hiding this comment.
One advantage of sticking the member on the AnyFunctionRef is you wouldn't have to pass along the ASTContext, but I don't feel too strongly about it
Comment on lines
+921
to
+923
| if (SmallVector<ReturnStmt *> returnStmts; | ||
| func->getBody()->getExplicitReturnStmts(ctx, returnStmts), | ||
| !returnStmts.empty()) { |
There was a problem hiding this comment.
Cute, but I would rather just bind returnStmts outside the if, up to you though
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #76362, fixes #76746, fixes #76747.
These are technically source breaking, but the cases in which they break source are quite niche.