bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use IndexVec::indices instead of reimplementing it

Browse source 
The change is limited to the iteration over indices instead of using
`basic_blocks_mut()` directly, in the case the previous implementation
intentionally avoided invalidating the caches stored in MIR body.
This commit is contained in:
Tomasz Miąsko 2021-10-11 00:00:00 +00:00
parent 763703cb76
commit d5a91f3114
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
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};
@ -73,10 +72,7 @@ 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>) {
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 {