bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

inline explicit rpo access in promote consts

Browse source
This commit is contained in:
Rémy Rakic 2023-06-14 19:52:49 +00:00
parent afa9fef709
commit e596579066
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_const_eval/src/transform/promote_consts.rs
View file

@ -14,7 +14,6 @@
use rustc_hir as hir; use rustc_hir as hir;
use rustc_middle::mir; use rustc_middle::mir;
use rustc_middle::mir::traversal::ReversePostorderIter;
use rustc_middle::mir::visit::{MutVisitor, MutatingUseContext, PlaceContext, Visitor}; use rustc_middle::mir::visit::{MutVisitor, MutatingUseContext, PlaceContext, Visitor};
use rustc_middle::mir::*; use rustc_middle::mir::*;
use rustc_middle::ty::subst::InternalSubsts; use rustc_middle::ty::subst::InternalSubsts;
@ -53,9 +52,8 @@ impl<'tcx> MirPass<'tcx> for PromoteTemps<'tcx> {
return; return;
} }
let mut rpo = traversal::reverse_postorder(body);
let ccx = ConstCx::new(tcx, body); let ccx = ConstCx::new(tcx, body);
let (mut temps, all_candidates) = collect_temps_and_candidates(&ccx, &mut rpo); let (mut temps, all_candidates) = collect_temps_and_candidates(&ccx);
let promotable_candidates = validate_candidates(&ccx, &mut temps, &all_candidates); let promotable_candidates = validate_candidates(&ccx, &mut temps, &all_candidates);
@ -166,14 +164,13 @@ impl<'tcx> Visitor<'tcx> for Collector<'_, 'tcx> {
pub fn collect_temps_and_candidates<'tcx>( pub fn collect_temps_and_candidates<'tcx>(
ccx: &ConstCx<'_, 'tcx>, ccx: &ConstCx<'_, 'tcx>,
rpo: &mut ReversePostorderIter<'_, 'tcx>,
) -> (IndexVec<Local, TempState>, Vec<Candidate>) { ) -> (IndexVec<Local, TempState>, Vec<Candidate>) {
let mut collector = Collector { let mut collector = Collector {
temps: IndexVec::from_elem(TempState::Undefined, &ccx.body.local_decls), temps: IndexVec::from_elem(TempState::Undefined, &ccx.body.local_decls),
candidates: vec![], candidates: vec![],
ccx, ccx,
}; };
for (bb, data) in rpo { for (bb, data) in traversal::reverse_postorder(ccx.body) {
collector.visit_basic_block_data(bb, data); collector.visit_basic_block_data(bb, data);
} }
(collector.temps, collector.candidates) (collector.temps, collector.candidates)