bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #89764 - tmiasko:uninhabited-enums, r=wesleywiser

Browse source 
Fix variant index / discriminant confusion in uninhabited enum branching

Fix confusion between variant index and variant discriminant. The pass
incorrectly assumed that for `Variants::Single` variant index is the same as
variant discriminant.

r? `@wesleywiser`
This commit is contained in:
Matthias Krüger 2022-01-20 17:10:31 +01:00 • committed by GitHub
commit d188287a54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
compiler/rustc_mir_transform/src/uninhabited_enum_branching.rs
View file

@ -3,8 +3,7 @@
use crate::MirPass; use crate::MirPass;
use rustc_data_structures::stable_set::FxHashSet; use rustc_data_structures::stable_set::FxHashSet;
use rustc_middle::mir::{ use rustc_middle::mir::{
BasicBlock, BasicBlockData, Body, Local, Operand, Rvalue, StatementKind, SwitchTargets, BasicBlockData, Body, Local, Operand, Rvalue, StatementKind, SwitchTargets, TerminatorKind,
TerminatorKind,
}; };
use rustc_middle::ty::layout::TyAndLayout; use rustc_middle::ty::layout::TyAndLayout;
use rustc_middle::ty::{Ty, TyCtxt}; use rustc_middle::ty::{Ty, TyCtxt};
@ -56,7 +55,10 @@ fn variant_discriminants<'tcx>(
match &layout.variants { match &layout.variants {
Variants::Single { index } => { Variants::Single { index } => {
let mut res = FxHashSet::default(); let mut res = FxHashSet::default();
res.insert(index.as_u32() as u128); res.insert(
ty.discriminant_for_variant(tcx, *index)
.map_or(index.as_u32() as u128, |discr| discr.val),
);
res res
} }
Variants::Multiple { variants, .. } => variants Variants::Multiple { variants, .. } => variants
@ -75,16 +77,9 @@ impl<'tcx> MirPass<'tcx> for UninhabitedEnumBranching {
} }
fn run_pass(&self, tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) { fn run_pass(&self, tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
if body.source.promoted.is_some() {
return;
}
trace!("UninhabitedEnumBranching starting for {:?}", body.source); trace!("UninhabitedEnumBranching starting for {:?}", body.source);
let basic_block_count = body.basic_blocks().len(); for bb in body.basic_blocks().indices() {
for bb in 0..basic_block_count {
let bb = BasicBlock::from_usize(bb);
trace!("processing block {:?}", bb); trace!("processing block {:?}", bb);
let Some(discriminant_ty) = get_switched_on_type(&body.basic_blocks()[bb], tcx, body) else { let Some(discriminant_ty) = get_switched_on_type(&body.basic_blocks()[bb], tcx, body) else {