layout: Avoid niches that make things worse. #63903
Conversation
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @eddyb (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
rust-highfive
added
the
S-waiting-on-review
| @@ -951,19 +1024,20 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> { | |||
| Some(niche) => niche, | |||
| _ => continue, | |||
| }; | |||
| // Do not use a niche smaller than the tag unless it reduces the size. | |||
| if !must_grow && niche.available(dl) >> ity.size().bits() == 0 { | |||
There was a problem hiding this comment.
The size of the discriminant shouldn't be used (since it ignores the actual available range). Instead, you want to compare with .available(dl) on the tag niche (computed further down):
let largest_niche = Niche::from_scalar(dl, Size::ZERO, tag.clone());
| prefix_align = prefix_align.max(field.align.abi); | ||
| } | ||
| } | ||
| prefix_align = align.abi; |
There was a problem hiding this comment.
The fact that some of this code was moved up but not all of it makes me uneasy. I can't easily tell if it will always produce the same result.
There was a problem hiding this comment.
The niche filling code needs to use the alignment without ity.align(dl). I suppose I could use a different name for that, maybe body_align, and only set align after we know that we'll use a tag.
There was a problem hiding this comment.
I would very much prefer to fix the bug without landing #63902.
|
☔ The latest upstream changes (presumably #63998) made this pull request unmergeable. Please resolve the merge conflicts. |
rustbot
added
S-waiting-on-author
|
Ping from triage: @hvenev any updates on this? |
|
I've been busy over the last few weeks. I should be able to work on this in a few days. |
joelpalmer
added
S-inactive
|
Ping from Triage: @hvenev we are closing this due to inactivity. However, when you have updates, please re-open. Thanks for the PR. |
After pull request #63902. Fixes issue #63866.
In cases where adding a tag does not increase the size of the enum, don't use a niche that has fewer values than the tag.