Skip to content

Commit eebf676

Browse files
committed
fix getting the discriminant of a zero-variant enum
1 parent c8e9497 commit eebf676

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

compiler/rustc_middle/src/ty/sty.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -2067,7 +2067,9 @@ impl<'tcx> TyS<'tcx> {
20672067
) -> Option<Discr<'tcx>> {
20682068
match self.kind() {
20692069
TyKind::Adt(adt, _) if adt.variants.is_empty() => {
2070-
bug!("discriminant_for_variant called on zero variant enum");
2070+
// This can actually happen during CTFE, see
2071+
// https://github.com/rust-lang/rust/issues/89765.
2072+
None
20712073
}
20722074
TyKind::Adt(adt, _) if adt.is_enum() => {
20732075
Some(adt.discriminant_for_variant(tcx, variant_index))

src/test/ui/consts/const_discriminant.rs

+6
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ enum SingleVariant {
2525

2626
const TEST_V: Discriminant<SingleVariant> = discriminant(&SingleVariant::V);
2727

28+
pub const TEST_VOID: () = {
29+
// This is UB, but CTFE does not check validity so it does not detect this.
30+
unsafe { std::mem::discriminant(&*(&() as *const () as *const Void)); };
31+
};
32+
33+
2834
fn main() {
2935
assert_eq!(TEST_A, TEST_A_OTHER);
3036
assert_eq!(TEST_A, discriminant(black_box(&Test::A(17))));

0 commit comments

Comments
 (0)