mirror of
https://github.com/rust-lang/rust
synced 2024-10-14 12:33:57 +00:00
d33ec8ed8c
safe transmute: support `Single` enums Previously, the implementation of `Tree::from_enum` incorrectly treated enums with `Variants::Single` and `Variants::Multiple` identically. This is incorrect for `Variants::Single` enums, which delegate their layout to that of a variant with a particular index (or no variant at all if the enum is empty). This flaw manifested first as an ICE. `Tree::from_enum` attempted to compute the tag of variants other than the one at `Variants::Single`'s `index`, and fell afoul of a sanity-checking assertion in `compiler/rustc_const_eval/src/interpret/discriminant.rs`. This assertion is non-load-bearing, and can be removed; the routine its in is well-behaved even without it. With the assertion removed, the proximate issue becomes apparent: calling `Tree::from_variant` on a variant that does not exist is ill-defined. A sanity check the given variant has `FieldShapes::Arbitrary` fails, and the analysis is (correctly) aborted with `Err::NotYetSupported`. This commit corrects this chain of failures by ensuring that `Tree::from_variant` is not called on variants that are, as far as layout is concerned, nonexistent. Specifically, the implementation of `Tree::from_enum` is now partitioned into three cases: 1. enums that are uninhabited 2. enums for which all but one variant is uninhabited 3. enums with multiple inhabited variants `Tree::from_variant` is now only invoked in the third case. In the first case, `Tree::uninhabited()` is produced. In the second case, the layout is delegated to `Variants::Single`'s index. Fixes #125811 |
||
|---|---|---|
| .. | ||
| abstraction | ||
| alignment | ||
| arrays | ||
| enums | ||
| malformed-program-gracefulness | ||
| primitives | ||
| references | ||
| safety | ||
| structs | ||
| unions | ||
| issue-101739-1.rs | ||
| issue-101739-1.stderr | ||
| issue-101739-2.rs | ||
| issue-101739-2.stderr | ||
| issue-110467.rs | ||
| issue-110892.rs | ||
| issue-110892.stderr | ||
| maybeuninit.rs | ||
| maybeuninit.stderr | ||
| region-infer.rs | ||
| region-infer.stderr | ||
| transmute-padding-ice.rs | ||
| uninhabited.rs | ||
| uninhabited.stderr | ||