Skip to content

Commit 8b7853f

Browse files
committed
Auto merge of #92932 - ouz-a:master, r=oli-obk
Temporary fix for the layout of aligned enums Fix for the issue #92464 ~~I was after this issue for quite some time now, I have a temporary fix for it. I think the current problem is [here](https://github.com/ouz-a/rust/blob/e75f96763f99d56d03ada939fe05cbeb2254888d/compiler/rustc_middle/src/ty/layout.rs#L1305-L1310) created `tag` value might be wrong, because when I checked `min` and `max` values it's always between 0..1, which results in wrong size comparison in a few lines down below. I think `min` and `max` values don't take `#[repr(aligned(8))]` into consideration and just act from base values assigned inside the enum. If what I am saying is true, aligned enums were created with the wrong layout for some time.~~ ~~As stated in the title this is only a temporary fix and I think this needs further investigation, if someone wants to mentor it I would like to work on that too.~~ 😸 **Edit: Weird some tests fail now going to close this for now...** **Edit2: I made it work again.** I think I figured out the main problem of the issue, layout types of aligned enums with custom discriminant types were not handled, which resulted in confusing(such as this issue) behavior down the line, this is a kinda hacky fix for the issue.
2 parents 796bf14 + fd5be23 commit 8b7853f

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

compiler/rustc_middle/src/ty/layout.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1310,7 +1310,10 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
13101310
},
13111311
};
13121312
let mut abi = Abi::Aggregate { sized: true };
1313-
if tag.value.size(dl) == size {
1313+
1314+
// Without latter check aligned enums with custom discriminant values
1315+
// Would result in ICE see the issue #92464 for more info
1316+
if tag.value.size(dl) == size || variants.iter().all(|layout| layout.is_empty()) {
13141317
abi = Abi::Scalar(tag);
13151318
} else {
13161319
// Try to use a ScalarPair for all tagged enums.

src/test/ui/aligned_enum_cast.rs

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// run-pass
2+
// allows aligned custom discriminant enums to cast into other types
3+
// See the issue #92464 for more info
4+
#[allow(dead_code)]
5+
#[repr(align(8))]
6+
enum Aligned {
7+
Zero = 0,
8+
One = 1,
9+
}
10+
11+
fn main() {
12+
let aligned = Aligned::Zero;
13+
let fo = aligned as u8;
14+
println!("foo {}",fo);
15+
}

0 commit comments

Comments
 (0)