Propagate PlaceElem::Index.

cjgillot · cjgillot · commit b365b5fc25d0 · 2023-07-21T14:33:50.000Z
diff --git a/compiler/rustc_mir_transform/src/dataflow_const_prop.rs b/compiler/rustc_mir_transform/src/dataflow_const_prop.rs
@@ -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, Ty, TyCtxt};
@@ -579,11 +579,29 @@ impl<'tcx> MutVisitor<'tcx> for CollectAndPatch<'tcx> {
             Operand::Copy(place) | Operand::Move(place) => {
                 if let Some(value) = self.before_effect.get(&(location, *place)) {
                     *operand = self.make_operand(value.clone());
+                } else if !place.projection.is_empty() {
+                    self.super_operand(operand, location)
                 }
             }
             _ => (),
         }
     }
+
+    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.0.to_target_usize(&self.tcx)
+            && let Some(min_length) = offset.checked_add(1)
+        {
+            Some(PlaceElem::ConstantIndex { offset, min_length, from_end: false })
+        } else {
+            None
+        }
+    }
 }
 
 pub(crate) struct OperandCollector<'tcx, 'map, 'a> {
@@ -594,17 +612,21 @@ pub(crate) struct OperandCollector<'tcx, 'map, 'a> {
 
 impl<'tcx, 'map, 'a> Visitor<'tcx> for OperandCollector<'tcx, 'map, 'a> {
     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);
         }
     }
 }
diff --git a/tests/mir-opt/const_prop/array_index.main.ConstProp.32bit.panic-abort.diff b/tests/mir-opt/const_prop/array_index.main.ConstProp.32bit.panic-abort.diff
@@ -27,7 +27,8 @@
       }
   
       bb1: {
-          _1 = _2[_3];
+-         _1 = _2[_3];
++         _1 = _2[2 of 3];
           StorageDead(_3);
           StorageDead(_2);
           _0 = const ();
diff --git a/tests/mir-opt/const_prop/array_index.main.ConstProp.32bit.panic-unwind.diff b/tests/mir-opt/const_prop/array_index.main.ConstProp.32bit.panic-unwind.diff
@@ -27,7 +27,8 @@
       }
   
       bb1: {
-          _1 = _2[_3];
+-         _1 = _2[_3];
++         _1 = _2[2 of 3];
           StorageDead(_3);
           StorageDead(_2);
           _0 = const ();
diff --git a/tests/mir-opt/const_prop/array_index.main.ConstProp.64bit.panic-abort.diff b/tests/mir-opt/const_prop/array_index.main.ConstProp.64bit.panic-abort.diff
@@ -27,7 +27,8 @@
       }
   
       bb1: {
-          _1 = _2[_3];
+-         _1 = _2[_3];
++         _1 = _2[2 of 3];
           StorageDead(_3);
           StorageDead(_2);
           _0 = const ();
diff --git a/tests/mir-opt/const_prop/array_index.main.ConstProp.64bit.panic-unwind.diff b/tests/mir-opt/const_prop/array_index.main.ConstProp.64bit.panic-unwind.diff
@@ -27,7 +27,8 @@
       }
   
       bb1: {
-          _1 = _2[_3];
+-         _1 = _2[_3];
++         _1 = _2[2 of 3];
           StorageDead(_3);
           StorageDead(_2);
           _0 = const ();
diff --git a/tests/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.32bit.panic-abort.diff b/tests/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.32bit.panic-abort.diff
@@ -43,7 +43,8 @@
       }
   
       bb1: {
-          _5 = (*_1)[_6];
+-         _5 = (*_1)[_6];
++         _5 = (*_1)[3 of 4];
           StorageDead(_6);
           _0 = const ();
           StorageDead(_5);
diff --git a/tests/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.32bit.panic-unwind.diff b/tests/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.32bit.panic-unwind.diff
@@ -43,7 +43,8 @@
       }
   
       bb1: {
-          _5 = (*_1)[_6];
+-         _5 = (*_1)[_6];
++         _5 = (*_1)[3 of 4];
           StorageDead(_6);
           _0 = const ();
           StorageDead(_5);
diff --git a/tests/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.64bit.panic-abort.diff b/tests/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.64bit.panic-abort.diff
@@ -43,7 +43,8 @@
       }
   
       bb1: {
-          _5 = (*_1)[_6];
+-         _5 = (*_1)[_6];
++         _5 = (*_1)[3 of 4];
           StorageDead(_6);
           _0 = const ();
           StorageDead(_5);
diff --git a/tests/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.64bit.panic-unwind.diff b/tests/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.64bit.panic-unwind.diff
@@ -43,7 +43,8 @@
       }
   
       bb1: {
-          _5 = (*_1)[_6];
+-         _5 = (*_1)[_6];
++         _5 = (*_1)[3 of 4];
           StorageDead(_6);
           _0 = const ();
           StorageDead(_5);
diff --git a/tests/mir-opt/const_prop/large_array_index.main.ConstProp.32bit.panic-abort.diff b/tests/mir-opt/const_prop/large_array_index.main.ConstProp.32bit.panic-abort.diff
@@ -27,7 +27,8 @@
       }
   
       bb1: {
-          _1 = _2[_3];
+-         _1 = _2[_3];
++         _1 = _2[2 of 3];
           StorageDead(_3);
           StorageDead(_2);
           _0 = const ();
diff --git a/tests/mir-opt/const_prop/large_array_index.main.ConstProp.32bit.panic-unwind.diff b/tests/mir-opt/const_prop/large_array_index.main.ConstProp.32bit.panic-unwind.diff
@@ -27,7 +27,8 @@
       }
   
       bb1: {
-          _1 = _2[_3];
+-         _1 = _2[_3];
++         _1 = _2[2 of 3];
           StorageDead(_3);
           StorageDead(_2);
           _0 = const ();
diff --git a/tests/mir-opt/const_prop/large_array_index.main.ConstProp.64bit.panic-abort.diff b/tests/mir-opt/const_prop/large_array_index.main.ConstProp.64bit.panic-abort.diff
@@ -27,7 +27,8 @@
       }
   
       bb1: {
-          _1 = _2[_3];
+-         _1 = _2[_3];
++         _1 = _2[2 of 3];
           StorageDead(_3);
           StorageDead(_2);
           _0 = const ();
diff --git a/tests/mir-opt/const_prop/large_array_index.main.ConstProp.64bit.panic-unwind.diff b/tests/mir-opt/const_prop/large_array_index.main.ConstProp.64bit.panic-unwind.diff
@@ -27,7 +27,8 @@
       }
   
       bb1: {
-          _1 = _2[_3];
+-         _1 = _2[_3];
++         _1 = _2[2 of 3];
           StorageDead(_3);
           StorageDead(_2);
           _0 = const ();
diff --git a/tests/mir-opt/const_prop/repeat.main.ConstProp.32bit.panic-abort.diff b/tests/mir-opt/const_prop/repeat.main.ConstProp.32bit.panic-abort.diff
@@ -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);
diff --git a/tests/mir-opt/const_prop/repeat.main.ConstProp.32bit.panic-unwind.diff b/tests/mir-opt/const_prop/repeat.main.ConstProp.32bit.panic-unwind.diff
@@ -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);
diff --git a/tests/mir-opt/const_prop/repeat.main.ConstProp.64bit.panic-abort.diff b/tests/mir-opt/const_prop/repeat.main.ConstProp.64bit.panic-abort.diff
@@ -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);
diff --git a/tests/mir-opt/const_prop/repeat.main.ConstProp.64bit.panic-unwind.diff b/tests/mir-opt/const_prop/repeat.main.ConstProp.64bit.panic-unwind.diff
@@ -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);
diff --git a/tests/mir-opt/const_prop/slice_len.main.ConstProp.32bit.panic-abort.diff b/tests/mir-opt/const_prop/slice_len.main.ConstProp.32bit.panic-abort.diff
@@ -34,7 +34,8 @@
       }
   
       bb1: {
-          _1 = (*_2)[_6];
+-         _1 = (*_2)[_6];
++         _1 = (*_2)[1 of 2];
           StorageDead(_6);
           StorageDead(_4);
           StorageDead(_2);
diff --git a/tests/mir-opt/const_prop/slice_len.main.ConstProp.32bit.panic-unwind.diff b/tests/mir-opt/const_prop/slice_len.main.ConstProp.32bit.panic-unwind.diff
@@ -34,7 +34,8 @@
       }
   
       bb1: {
-          _1 = (*_2)[_6];
+-         _1 = (*_2)[_6];
++         _1 = (*_2)[1 of 2];
           StorageDead(_6);
           StorageDead(_4);
           StorageDead(_2);
diff --git a/tests/mir-opt/const_prop/slice_len.main.ConstProp.64bit.panic-abort.diff b/tests/mir-opt/const_prop/slice_len.main.ConstProp.64bit.panic-abort.diff
@@ -34,7 +34,8 @@
       }
   
       bb1: {
-          _1 = (*_2)[_6];
+-         _1 = (*_2)[_6];
++         _1 = (*_2)[1 of 2];
           StorageDead(_6);
           StorageDead(_4);
           StorageDead(_2);
diff --git a/tests/mir-opt/const_prop/slice_len.main.ConstProp.64bit.panic-unwind.diff b/tests/mir-opt/const_prop/slice_len.main.ConstProp.64bit.panic-unwind.diff
@@ -34,7 +34,8 @@
       }
   
       bb1: {
-          _1 = (*_2)[_6];
+-         _1 = (*_2)[_6];
++         _1 = (*_2)[1 of 2];
           StorageDead(_6);
           StorageDead(_4);
           StorageDead(_2);
diff --git a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.ConstProp.32bit.panic-abort.diff b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.ConstProp.32bit.panic-abort.diff
@@ -45,7 +45,8 @@
       }
   
       bb2: {
-          _3 = _4[_5];
+-         _3 = _4[_5];
++         _3 = _4[3 of 4];
           StorageDead(_5);
           StorageDead(_4);
           _9 = const 42_u32;
diff --git a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.ConstProp.32bit.panic-unwind.diff b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.ConstProp.32bit.panic-unwind.diff
@@ -45,7 +45,8 @@
       }
   
       bb2: {
-          _3 = _4[_5];
+-         _3 = _4[_5];
++         _3 = _4[3 of 4];
           StorageDead(_5);
           StorageDead(_4);
           _9 = const 42_u32;
diff --git a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.ConstProp.64bit.panic-abort.diff b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.ConstProp.64bit.panic-abort.diff
@@ -45,7 +45,8 @@
       }
   
       bb2: {
-          _3 = _4[_5];
+-         _3 = _4[_5];
++         _3 = _4[3 of 4];
           StorageDead(_5);
           StorageDead(_4);
           _9 = const 42_u32;
diff --git a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.ConstProp.64bit.panic-unwind.diff b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.ConstProp.64bit.panic-unwind.diff
@@ -45,7 +45,8 @@
       }
   
       bb2: {
-          _3 = _4[_5];
+-         _3 = _4[_5];
++         _3 = _4[3 of 4];
           StorageDead(_5);
           StorageDead(_4);
           _9 = const 42_u32;

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`bb1: {`
`30`		`- _1 = _2[_3];`
	`30`	`+- _1 = _2[_3];`
	`31`	`++ _1 = _2[2 of 3];`
`31`	`32`	`StorageDead(_3);`
`32`	`33`	`StorageDead(_2);`
`33`	`34`	`_0 = const ();`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,8 @@`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`bb1: {`
`46`		`- _5 = (*_1)[_6];`
	`46`	`+- _5 = (*_1)[_6];`
	`47`	`++ _5 = (*_1)[3 of 4];`
`47`	`48`	`StorageDead(_6);`
`48`	`49`	`_0 = const ();`
`49`	`50`	`StorageDead(_5);`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,8 @@`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`bb1: {`
`32`		`- _2 = _3[_4];`
	`32`	`+- _2 = _3[_4];`
	`33`	`++ _2 = _3[2 of 3];`
`33`	`34`	`_1 = Add(move _2, const 0_u32);`
`34`	`35`	`StorageDead(_2);`
`35`	`36`	`StorageDead(_4);`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`bb1: {`
`37`		`- _1 = (*_2)[_6];`
	`37`	`+- _1 = (*_2)[_6];`
	`38`	`++ _1 = (*_2)[1 of 2];`
`38`	`39`	`StorageDead(_6);`
`39`	`40`	`StorageDead(_4);`
`40`	`41`	`StorageDead(_2);`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`bb2: {`
`48`		`- _3 = _4[_5];`
	`48`	`+- _3 = _4[_5];`
	`49`	`++ _3 = _4[3 of 4];`
`49`	`50`	`StorageDead(_5);`
`50`	`51`	`StorageDead(_4);`
`51`	`52`	`_9 = const 42_u32;`