Skip to content

Commit 09d7ce8

Browse files
wesleywiserwesleywiser
committedNov 4, 2019
Test
1 parent 0d5264a commit 09d7ce8

File tree

5 files changed

+36
-25
lines changed

5 files changed

+36
-25
lines changed
 

‎src/librustc_mir/transform/const_prop.rs

+25-14
Original file line numberDiff line numberDiff line change
@@ -619,8 +619,19 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
619619
}
620620
}
621621

622-
fn should_const_prop(&self) -> bool {
623-
self.tcx.sess.opts.debugging_opts.mir_opt_level >= 2
622+
fn should_const_prop(&mut self, op: OpTy<'tcx>) -> bool {
623+
if self.tcx.sess.opts.debugging_opts.mir_opt_level >= 2 {
624+
return true;
625+
}
626+
627+
match *op {
628+
interpret::Operand::Immediate(Immediate::Scalar(ScalarMaybeUndef::Scalar(s))) =>
629+
s.is_bits(),
630+
interpret::Operand::Immediate(Immediate::ScalarPair(ScalarMaybeUndef::Scalar(l),
631+
ScalarMaybeUndef::Scalar(r))) =>
632+
l.is_bits() && r.is_bits(),
633+
_ => false
634+
}
624635
}
625636
}
626637

@@ -719,15 +730,15 @@ impl<'mir, 'tcx> MutVisitor<'tcx> for ConstPropagator<'mir, 'tcx> {
719730
if self.can_const_prop[local] {
720731
trace!("propagated into {:?}", local);
721732

722-
if self.should_const_prop() {
723-
let value =
724-
self.get_const(local).expect("local was dead/uninitialized");
725-
trace!("replacing {:?} with {:?}", rval, value);
726-
self.replace_with_const(
727-
rval,
728-
value,
729-
statement.source_info,
730-
);
733+
if let Some(value) = self.get_const(local) {
734+
if self.should_const_prop(value) {
735+
trace!("replacing {:?} with {:?}", rval, value);
736+
self.replace_with_const(
737+
rval,
738+
value,
739+
statement.source_info,
740+
);
741+
}
731742
}
732743
} else {
733744
trace!("can't propagate into {:?}", local);
@@ -827,7 +838,7 @@ impl<'mir, 'tcx> MutVisitor<'tcx> for ConstPropagator<'mir, 'tcx> {
827838
&msg,
828839
);
829840
} else {
830-
if self.should_const_prop() {
841+
if self.should_const_prop(value) {
831842
if let ScalarMaybeUndef::Scalar(scalar) = value_const {
832843
*cond = self.operand_from_scalar(
833844
scalar,
@@ -840,8 +851,8 @@ impl<'mir, 'tcx> MutVisitor<'tcx> for ConstPropagator<'mir, 'tcx> {
840851
}
841852
},
842853
TerminatorKind::SwitchInt { ref mut discr, switch_ty, .. } => {
843-
if self.should_const_prop() {
844-
if let Some(value) = self.eval_operand(&discr, source_info) {
854+
if let Some(value) = self.eval_operand(&discr, source_info) {
855+
if self.should_const_prop(value) {
845856
if let ScalarMaybeUndef::Scalar(scalar) =
846857
self.ecx.read_scalar(value).unwrap() {
847858
*discr = self.operand_from_scalar(scalar, switch_ty, source_info.span);

‎src/test/codegen/inline-always-works-always.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub extern "C" fn callee() -> u32 {
1414
// CHECK-LABEL: caller
1515
// SIZE-OPT: ret i32 8
1616
// SPEED-OPT: ret i32 8
17-
// NO-OPT: ret i32 8
17+
// NO-OPT: ret i32 %3
1818
#[no_mangle]
1919
pub extern "C" fn caller() -> u32 {
2020
callee()

‎src/test/codegen/optimize-attr-1.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
// CHECK-LABEL: define i32 @nothing
1010
// CHECK-SAME: [[NOTHING_ATTRS:#[0-9]+]]
11-
// NO-OPT: ret i32 %_1.0
11+
// NO-OPT: ret i32 %3
1212
// SIZE-OPT: ret i32 4
1313
// SPEEC-OPT: ret i32 4
1414
#[no_mangle]
@@ -18,7 +18,7 @@ pub fn nothing() -> i32 {
1818

1919
// CHECK-LABEL: define i32 @size
2020
// CHECK-SAME: [[SIZE_ATTRS:#[0-9]+]]
21-
// NO-OPT: ret i32 %_1.0
21+
// NO-OPT: ret i32 %3
2222
// SIZE-OPT: ret i32 6
2323
// SPEED-OPT: ret i32 6
2424
#[optimize(size)]
@@ -31,7 +31,7 @@ pub fn size() -> i32 {
3131
// NO-OPT-SAME: [[NOTHING_ATTRS]]
3232
// SPEED-OPT-SAME: [[NOTHING_ATTRS]]
3333
// SIZE-OPT-SAME: [[SPEED_ATTRS:#[0-9]+]]
34-
// NO-OPT: ret i32 %_1.0
34+
// NO-OPT: ret i32 %3
3535
// SIZE-OPT: ret i32 8
3636
// SPEED-OPT: ret i32 8
3737
#[optimize(speed)]

‎src/test/incremental/hashes/while_let_loops.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ pub fn change_loop_condition() {
4848
}
4949

5050
#[cfg(not(cfail1))]
51-
#[rustc_clean(cfg="cfail2", except="HirBody, mir_built, optimized_mir")]
51+
#[rustc_clean(cfg="cfail2", except="HirBody, mir_built")]
5252
#[rustc_clean(cfg="cfail3")]
5353
pub fn change_loop_condition() {
5454
let mut _x = 0;
@@ -70,7 +70,7 @@ pub fn add_break() {
7070
}
7171

7272
#[cfg(not(cfail1))]
73-
#[rustc_clean(cfg="cfail2", except="HirBody, mir_built, optimized_mir, typeck_tables_of")]
73+
#[rustc_clean(cfg="cfail2", except="HirBody, mir_built, typeck_tables_of")]
7474
#[rustc_clean(cfg="cfail3")]
7575
pub fn add_break() {
7676
let mut _x = 0;
@@ -141,7 +141,7 @@ pub fn change_break_label() {
141141
}
142142

143143
#[cfg(not(cfail1))]
144-
#[rustc_clean(cfg="cfail2", except="HirBody, mir_built, optimized_mir")]
144+
#[rustc_clean(cfg="cfail2", except="HirBody, mir_built")]
145145
#[rustc_clean(cfg="cfail3")]
146146
pub fn change_break_label() {
147147
let mut _x = 0;
@@ -191,7 +191,7 @@ pub fn change_continue_label() {
191191
}
192192

193193
#[cfg(not(cfail1))]
194-
#[rustc_clean(cfg="cfail2", except="HirBody, mir_built, optimized_mir")]
194+
#[rustc_clean(cfg="cfail2", except="HirBody, mir_built")]
195195
#[rustc_clean(cfg="cfail3")]
196196
pub fn change_continue_label() {
197197
let mut _x = 0;
@@ -216,7 +216,7 @@ pub fn change_continue_to_break() {
216216
}
217217

218218
#[cfg(not(cfail1))]
219-
#[rustc_clean(cfg="cfail2", except="HirBody, mir_built, optimized_mir")]
219+
#[rustc_clean(cfg="cfail2", except="HirBody, mir_built")]
220220
#[rustc_clean(cfg="cfail3")]
221221
pub fn change_continue_to_break() {
222222
let mut _x = 0;

‎src/test/incremental/hashes/while_loops.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ pub fn change_loop_condition() {
4848
}
4949

5050
#[cfg(not(cfail1))]
51-
#[rustc_clean(cfg="cfail2", except="HirBody, mir_built, optimized_mir")]
51+
#[rustc_clean(cfg="cfail2", except="HirBody, mir_built")]
5252
#[rustc_clean(cfg="cfail3")]
5353
pub fn change_loop_condition() {
5454
let mut _x = 0;
@@ -191,7 +191,7 @@ pub fn change_continue_label() {
191191
}
192192

193193
#[cfg(not(cfail1))]
194-
#[rustc_clean(cfg="cfail2", except="HirBody, mir_built, optimized_mir")]
194+
#[rustc_clean(cfg="cfail2", except="HirBody, mir_built")]
195195
#[rustc_clean(cfg="cfail3")]
196196
pub fn change_continue_label() {
197197
let mut _x = 0;

0 commit comments

Comments
 (0)