Fix unsized coercion of a struct element #1880
Merged
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
Fix issues with how we are generating code for casting (model-checking#566, and model-checking#1528). Restructure the unsize casting to be done in one pass instead with deep recursion (model-checking#1531). This also reuses the code from the reachability analysis, so we don't have to keep two ways of traversing the same structure.
danielsn
approved these changes
Nov 14, 2022
| let mut field_type = src_goto_expr; | ||
| CoerceUnsizedIterator::new(self.tcx, src_mir_type, dst_mir_type) | ||
| .map(|info| { | ||
| let expr = if let Some(field_symbol) = info.field { |
There was a problem hiding this comment.
What does it mean if info doesn't have a field?
There was a problem hiding this comment.
It means we are no longer traversing a structure. I.e.: we found the underlying pointer.
There was a problem hiding this comment.
I added some comments to see if it helps.
| let dst_field_exprs = src_field_exprs | ||
| .into_iter() | ||
| .map(|(key, val)| { | ||
| let new_val = if info.field.unwrap().as_str().intern() == key { |
There was a problem hiding this comment.
Does this potentially intern strings we didn't need to?
There was a problem hiding this comment.
I don't think so. Don't we intern the name of every field for every type already?
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Description of changes:
Fix issues with how we are generating code for casting (#566, and #1528).
Restructure the unsize casting to be done in one pass instead with deep recursion (#1531). This also reuses the code from the reachability analysis, so we don't have to keep two ways of traversing the same structure.
Resolved issues:
Fixes #566
Fixes #1528
Fixes #1531
Related RFC:
Call-outs:
Testing:
How is this change tested? New tests
Is this a refactor change? Yes
Checklist
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.