mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use ConstCx for validate_candidates

Browse Source
This commit is contained in:
Oliver Scherer 2020-04-02 16:38:50 +02:00
parent 0bc743ed12
commit 22a53790ed
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustc_mir/borrow_check/type_check/mod.rs
View File

@ -1997,7 +1997,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
// be mentioned, need to check if the rvalue is promotable. // be mentioned, need to check if the rvalue is promotable.
let should_suggest = let should_suggest =
should_suggest_const_in_array_repeat_expressions_attribute( should_suggest_const_in_array_repeat_expressions_attribute(
ccx, operand, &ccx, operand,
); );
debug!("check_rvalue: should_suggest={:?}", should_suggest); debug!("check_rvalue: should_suggest={:?}", should_suggest);

16
src/librustc_mir/transform/promote_consts.rs
View File

@ -65,7 +65,7 @@ impl<'tcx> MirPass<'tcx> for PromoteTemps<'tcx> {
let ccx = ConstCx::new(tcx, def_id, body); let ccx = ConstCx::new(tcx, def_id, body);
let (temps, all_candidates) = collect_temps_and_candidates(&ccx, &mut rpo); let (temps, all_candidates) = collect_temps_and_candidates(&ccx, &mut rpo);
let promotable_candidates = validate_candidates(tcx, body, def_id, &temps, &all_candidates); let promotable_candidates = validate_candidates(&ccx, &temps, &all_candidates);
let promoted = promote_candidates(def_id, body, tcx, temps, promotable_candidates); let promoted = promote_candidates(def_id, body, tcx, temps, promotable_candidates);
self.promoted_fragments.set(promoted); self.promoted_fragments.set(promoted);
@ -262,7 +262,7 @@ pub fn collect_temps_and_candidates(
/// ///
/// This wraps an `Item`, and has access to all fields of that `Item` via `Deref` coercion. /// This wraps an `Item`, and has access to all fields of that `Item` via `Deref` coercion.
struct Validator<'a, 'tcx> { struct Validator<'a, 'tcx> {
ccx: ConstCx<'a, 'tcx>, ccx: &'a ConstCx<'a, 'tcx>,
temps: &'a IndexVec<Local, TempState>, temps: &'a IndexVec<Local, TempState>,
/// Explicit promotion happens e.g. for constant arguments declared via /// Explicit promotion happens e.g. for constant arguments declared via
@ -715,13 +715,11 @@ impl<'tcx> Validator<'_, 'tcx> {
// FIXME(eddyb) remove the differences for promotability in `static`, `const`, `const fn`. // FIXME(eddyb) remove the differences for promotability in `static`, `const`, `const fn`.
pub fn validate_candidates( pub fn validate_candidates(
tcx: TyCtxt<'tcx>, ccx: &ConstCx<'_, '_>,
body: &Body<'tcx>,
def_id: DefId,
temps: &IndexVec<Local, TempState>, temps: &IndexVec<Local, TempState>,
candidates: &[Candidate], candidates: &[Candidate],
) -> Vec<Candidate> { ) -> Vec<Candidate> {
let mut validator = Validator { ccx: ConstCx::new(tcx, def_id, body), temps, explicit: false }; let mut validator = Validator { ccx, temps, explicit: false };
candidates candidates
.iter() .iter()
@ -735,9 +733,9 @@ pub fn validate_candidates(
let is_promotable = validator.validate_candidate(candidate).is_ok(); let is_promotable = validator.validate_candidate(candidate).is_ok();
match candidate { match candidate {
Candidate::Argument { bb, index } if !is_promotable => { Candidate::Argument { bb, index } if !is_promotable => {
let span = body[bb].terminator().source_info.span; let span = ccx.body[bb].terminator().source_info.span;
let msg = format!("argument {} is required to be a constant", index + 1); let msg = format!("argument {} is required to be a constant", index + 1);
tcx.sess.span_err(span, &msg); ccx.tcx.sess.span_err(span, &msg);
} }
_ => (), _ => (),
} }
@ -1145,7 +1143,7 @@ pub fn promote_candidates<'tcx>(
/// Feature attribute should be suggested if `operand` can be promoted and the feature is not /// Feature attribute should be suggested if `operand` can be promoted and the feature is not
/// enabled. /// enabled.
crate fn should_suggest_const_in_array_repeat_expressions_attribute<'tcx>( crate fn should_suggest_const_in_array_repeat_expressions_attribute<'tcx>(
ccx: ConstCx<'_, 'tcx>, ccx: &ConstCx<'_, 'tcx>,
operand: &Operand<'tcx>, operand: &Operand<'tcx>,
) -> bool { ) -> bool {
let mut rpo = traversal::reverse_postorder(&ccx.body); let mut rpo = traversal::reverse_postorder(&ccx.body);