[CS] Map caught error type into context #80248
Merged
+29
−2
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
Factor out `ConstraintSystem::getExplicitCaughtErrorType` from `getCaughtErrorType`. Then use this for the contextual type for a `throw` syntactic element. rdar://139000351
hamishknight
force-pushed
the
fix-error-type
branch
from
599d2a4 to
c597023
Compare
|
@swift-ci please test |
xedin
reviewed
Mar 24, 2025
| @@ -969,7 +969,7 @@ class SyntacticElementConstraintGenerator | |||
| auto throwLoc = throwStmt->getThrowLoc(); | |||
| Type errorType; | |||
| if (auto catchNode = ASTScope::lookupCatchNode(module, throwLoc)) | |||
| errorType = catchNode.getExplicitCaughtType(cs.getASTContext()); | |||
| errorType = cs.getExplicitCaughtErrorType(catchNode); | |||
There was a problem hiding this comment.
My only note here is use of DC in existing code. Maybe we should propagate dc down explicitly to avoid problems in the future because DC in ConstraintSystem during solving could be difference from DC during constraint generation unfortunately...
There was a problem hiding this comment.
Yup, fortunately in this case being in a closure doesn't affect the result of mapping into context, but yeah I agree we ought to be passing the DeclContext down
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.
Factor out
ConstraintSystem::getExplicitCaughtErrorTypefromgetCaughtErrorType. Then use this for the contextual type for athrowsyntactic element.rdar://139000351
Resolves #77295