[CS] Fix a couple of use-after-frees #82596
Merged
Conversation
This file contains hidden or 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
Make sure we call `simplifyType` for the opened type bindings to ensure holes get converted to UnresolvedType. rdar://154553285
…ror` Diagnostics can outlive the ConstraintSystem itself if we have a diagnostic transaction for e.g `typeCheckParameterDefault`, make sure we don't try to use a solver-allocated type as an argument.
hamishknight
changed the title
computeSubstitutions
|
@swift-ci please test |
|
@swift-ci please test source compatibility |
xedin
approved these changes
Jun 28, 2025
| @@ -3880,7 +3880,8 @@ bool NonOptionalUnwrapFailure::diagnoseAsError() { | |||
| diagnostic = diag::invalid_force_unwrap; | |||
|
|
|||
| auto range = getSourceRange(); | |||
| emitDiagnostic(diagnostic, BaseType).highlight(range).fixItRemove(range.End); | |||
| emitDiagnostic(diagnostic, resolveType(BaseType)) | |||
There was a problem hiding this comment.
Would it be possible to move resolveType to the constructor of this diagnostic instead?
There was a problem hiding this comment.
Yeah it can probably be done with a pile of templating logic, I can look into that as a follow up
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.
Make sure we call
simplifyTypefor the opened type bindings incomputeSubstitutionsto ensure holes get converted to UnresolvedType. Also make sure we use the resolved type inNonOptionalUnwrapFailure::diagnoseAsErrorsince diagnostics can outlive the ConstraintSystem itself if we have a diagnostic transaction for e.gtypeCheckParameterDefault, so make sure we don't try to use a solver-allocated type as an argument.rdar://154553285