bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

slightly adapt const prop

Browse source
This commit is contained in:
Bastian Kauschke 2020-07-23 17:58:54 +02:00
parent d257bacfea
commit 61a9ab8fe6
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/librustc_mir/transform/const_prop.rs
View file

@ -582,7 +582,7 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
Some(()) Some(())
} }
fn propagate_operand(&mut self, operand: &mut Operand<'tcx>, location: Location) { fn propagate_operand(&mut self, operand: &mut Operand<'tcx>) {
match *operand { match *operand {
Operand::Copy(l) | Operand::Move(l) => { Operand::Copy(l) | Operand::Move(l) => {
if let Some(value) = self.get_const(l) { if let Some(value) = self.get_const(l) {
@ -606,7 +606,7 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
} }
} }
} }
Operand::Constant(ref mut ct) => self.visit_constant(ct, location), Operand::Constant(_) => (),
} }
} }
@ -934,12 +934,12 @@ impl<'mir, 'tcx> MutVisitor<'tcx> for ConstPropagator<'mir, 'tcx> {
} }
fn visit_operand(&mut self, operand: &mut Operand<'tcx>, location: Location) { fn visit_operand(&mut self, operand: &mut Operand<'tcx>, location: Location) {
self.super_operand(operand, location);
// Only const prop copies and moves on `mir_opt_level=3` as doing so // Only const prop copies and moves on `mir_opt_level=3` as doing so
// currently increases compile time. // currently increases compile time.
if self.tcx.sess.opts.debugging_opts.mir_opt_level < 3 { if self.tcx.sess.opts.debugging_opts.mir_opt_level >= 3 {
self.super_operand(operand, location) self.propagate_operand(operand)
} else {
self.propagate_operand(operand, location)
} }
} }
@ -1114,7 +1114,7 @@ impl<'mir, 'tcx> MutVisitor<'tcx> for ConstPropagator<'mir, 'tcx> {
// FIXME: This is currently redundant with `visit_operand`, but sadly // FIXME: This is currently redundant with `visit_operand`, but sadly
// always visiting operands currently causes a perf regression in LLVM codegen, so // always visiting operands currently causes a perf regression in LLVM codegen, so
// `visit_operand` currently only runs for propagates places for `mir_opt_level=3`. // `visit_operand` currently only runs for propagates places for `mir_opt_level=3`.
self.propagate_operand(discr, location) self.propagate_operand(discr)
} }
// None of these have Operands to const-propagate. // None of these have Operands to const-propagate.
TerminatorKind::Goto { .. } TerminatorKind::Goto { .. }