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

Propagate PlaceElem::Index.

Browse Source
This commit is contained in:
Camille GILLOT 2023-04-23 16:15:22 +00:00
parent fc63543792
commit f96c6e04cb
17 changed files with 65 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
compiler/rustc_mir_transform/src/dataflow_const_prop.rs
View File

@ -6,7 +6,7 @@ use rustc_const_eval::const_eval::CheckAlignment;
use rustc_const_eval::interpret::{ConstValue, ImmTy, Immediate, InterpCx, Scalar};
use rustc_data_structures::fx::FxHashMap;
use rustc_hir::def::DefKind;
use rustc_middle::mir::visit::{MutVisitor, Visitor};
use rustc_middle::mir::visit::{MutVisitor, NonMutatingUseContext, PlaceContext, Visitor};
use rustc_middle::mir::*;
use rustc_middle::ty::layout::TyAndLayout;
use rustc_middle::ty::{self, ScalarInt, Ty, TyCtxt};
@ -545,11 +545,29 @@ impl<'tcx> MutVisitor<'tcx> for CollectAndPatch<'tcx, '_> {
if let Some(value) = self.before_effect.get(&(location, *place)) {
let ty = place.ty(self.local_decls, self.tcx).ty;
*operand = self.make_operand(*value, ty);
} else if !place.projection.is_empty() {
self.super_operand(operand, location)
}
}
Operand::Constant(_) => {}
}
}
fn process_projection_elem(
&mut self,
elem: PlaceElem<'tcx>,
location: Location,
) -> Option<PlaceElem<'tcx>> {
if let PlaceElem::Index(local) = elem
&& let Some(value) = self.before_effect.get(&(location, local.into()))
&& let Ok(offset) = value.try_to_target_usize(self.tcx)
&& let Some(min_length) = offset.checked_add(1)
{
Some(PlaceElem::ConstantIndex { offset, min_length, from_end: false })
} else {
None
}
}
}
struct OperandCollector<'tcx, 'map, 'locals, 'a> {
@ -560,17 +578,21 @@ struct OperandCollector<'tcx, 'map, 'locals, 'a> {
impl<'tcx> Visitor<'tcx> for OperandCollector<'tcx, '_, '_, '_> {
fn visit_operand(&mut self, operand: &Operand<'tcx>, location: Location) {
match operand {
Operand::Copy(place) | Operand::Move(place) => {
match self.state.get(place.as_ref(), self.map) {
FlatSet::Top => (),
FlatSet::Elem(value) => {
self.visitor.before_effect.insert((location, *place), value);
}
FlatSet::Bottom => (),
}
if let Some(place) = operand.place() {
if let FlatSet::Elem(value) = self.state.get(place.as_ref(), self.map) {
self.visitor.before_effect.insert((location, place), value);
} else if !place.projection.is_empty() {
// Try to propagate into `Index` projections.
self.super_operand(operand, location)
}
_ => (),
}
}
fn visit_local(&mut self, local: Local, ctxt: PlaceContext, location: Location) {
if let PlaceContext::NonMutatingUse(NonMutatingUseContext::Copy | NonMutatingUseContext::Move) = ctxt
&& let FlatSet::Elem(value) = self.state.get(local.into(), self.map)
{
self.visitor.before_effect.insert((location, local.into()), value);
}
}
}

3
tests/mir-opt/dataflow-const-prop/array_index.main.DataflowConstProp.32bit.panic-abort.diff
View File

@ -27,7 +27,8 @@
}
bb1: {
_1 = _2[_3];
- _1 = _2[_3];
+ _1 = _2[2 of 3];
StorageDead(_3);
StorageDead(_2);
_0 = const ();

3
tests/mir-opt/dataflow-const-prop/array_index.main.DataflowConstProp.32bit.panic-unwind.diff
View File

@ -27,7 +27,8 @@
}
bb1: {
_1 = _2[_3];
- _1 = _2[_3];
+ _1 = _2[2 of 3];
StorageDead(_3);
StorageDead(_2);
_0 = const ();

3
tests/mir-opt/dataflow-const-prop/array_index.main.DataflowConstProp.64bit.panic-abort.diff
View File

@ -27,7 +27,8 @@
}
bb1: {
_1 = _2[_3];
- _1 = _2[_3];
+ _1 = _2[2 of 3];
StorageDead(_3);
StorageDead(_2);
_0 = const ();

3
tests/mir-opt/dataflow-const-prop/array_index.main.DataflowConstProp.64bit.panic-unwind.diff
View File

@ -27,7 +27,8 @@
}
bb1: {
_1 = _2[_3];
- _1 = _2[_3];
+ _1 = _2[2 of 3];
StorageDead(_3);
StorageDead(_2);
_0 = const ();

3
tests/mir-opt/dataflow-const-prop/large_array_index.main.DataflowConstProp.32bit.panic-abort.diff
View File

@ -27,7 +27,8 @@
}
bb1: {
_1 = _2[_3];
- _1 = _2[_3];
+ _1 = _2[2 of 3];
StorageDead(_3);
StorageDead(_2);
_0 = const ();

3
tests/mir-opt/dataflow-const-prop/large_array_index.main.DataflowConstProp.32bit.panic-unwind.diff
View File

@ -27,7 +27,8 @@
}
bb1: {
_1 = _2[_3];
- _1 = _2[_3];
+ _1 = _2[2 of 3];
StorageDead(_3);
StorageDead(_2);
_0 = const ();

3
tests/mir-opt/dataflow-const-prop/large_array_index.main.DataflowConstProp.64bit.panic-abort.diff
View File

@ -27,7 +27,8 @@
}
bb1: {
_1 = _2[_3];
- _1 = _2[_3];
+ _1 = _2[2 of 3];
StorageDead(_3);
StorageDead(_2);
_0 = const ();

3
tests/mir-opt/dataflow-const-prop/large_array_index.main.DataflowConstProp.64bit.panic-unwind.diff
View File

@ -27,7 +27,8 @@
}
bb1: {
_1 = _2[_3];
- _1 = _2[_3];
+ _1 = _2[2 of 3];
StorageDead(_3);
StorageDead(_2);
_0 = const ();

3
tests/mir-opt/dataflow-const-prop/repeat.main.DataflowConstProp.32bit.panic-abort.diff
View File

@ -29,7 +29,8 @@
}
bb1: {
_2 = _3[_4];
- _2 = _3[_4];
+ _2 = _3[2 of 3];
_1 = Add(move _2, const 0_u32);
StorageDead(_2);
StorageDead(_4);

3
tests/mir-opt/dataflow-const-prop/repeat.main.DataflowConstProp.32bit.panic-unwind.diff
View File

@ -29,7 +29,8 @@
}
bb1: {
_2 = _3[_4];
- _2 = _3[_4];
+ _2 = _3[2 of 3];
_1 = Add(move _2, const 0_u32);
StorageDead(_2);
StorageDead(_4);

3
tests/mir-opt/dataflow-const-prop/repeat.main.DataflowConstProp.64bit.panic-abort.diff
View File

@ -29,7 +29,8 @@
}
bb1: {
_2 = _3[_4];
- _2 = _3[_4];
+ _2 = _3[2 of 3];
_1 = Add(move _2, const 0_u32);
StorageDead(_2);
StorageDead(_4);

3
tests/mir-opt/dataflow-const-prop/repeat.main.DataflowConstProp.64bit.panic-unwind.diff
View File

@ -29,7 +29,8 @@
}
bb1: {
_2 = _3[_4];
- _2 = _3[_4];
+ _2 = _3[2 of 3];
_1 = Add(move _2, const 0_u32);
StorageDead(_2);
StorageDead(_4);

3
tests/mir-opt/dataflow-const-prop/slice_len.main.DataflowConstProp.32bit.panic-abort.diff
View File

@ -34,7 +34,8 @@
}
bb1: {
_1 = (*_2)[_6];
- _1 = (*_2)[_6];
+ _1 = (*_2)[1 of 2];
StorageDead(_6);
StorageDead(_4);
StorageDead(_2);

3
tests/mir-opt/dataflow-const-prop/slice_len.main.DataflowConstProp.32bit.panic-unwind.diff
View File

@ -34,7 +34,8 @@
}
bb1: {
_1 = (*_2)[_6];
- _1 = (*_2)[_6];
+ _1 = (*_2)[1 of 2];
StorageDead(_6);
StorageDead(_4);
StorageDead(_2);

3
tests/mir-opt/dataflow-const-prop/slice_len.main.DataflowConstProp.64bit.panic-abort.diff
View File

@ -34,7 +34,8 @@
}
bb1: {
_1 = (*_2)[_6];
- _1 = (*_2)[_6];
+ _1 = (*_2)[1 of 2];
StorageDead(_6);
StorageDead(_4);
StorageDead(_2);

3
tests/mir-opt/dataflow-const-prop/slice_len.main.DataflowConstProp.64bit.panic-unwind.diff
View File

@ -34,7 +34,8 @@
}
bb1: {
_1 = (*_2)[_6];
- _1 = (*_2)[_6];
+ _1 = (*_2)[1 of 2];
StorageDead(_6);
StorageDead(_4);
StorageDead(_2);