nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-02 15:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

ConstProp: Remove const when rvalue check fails.

Browse Source
This commit is contained in:
Alona Enraght-Moony 2023-11-28 21:43:23 +00:00
parent b1a6cf4a0e
commit 9121a41450
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/rustc_mir_transform/src/const_prop.rs
View File

@ -439,6 +439,7 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
// FIXME we need to revisit this for #67176 // FIXME we need to revisit this for #67176
if rvalue.has_param() { if rvalue.has_param() {
trace!("skipping, has param");
return None; return None;
} }
if !rvalue if !rvalue
@ -707,7 +708,11 @@ impl<'tcx> Visitor<'tcx> for ConstPropagator<'_, 'tcx> {
fn visit_assign(&mut self, place: &Place<'tcx>, rvalue: &Rvalue<'tcx>, location: Location) { fn visit_assign(&mut self, place: &Place<'tcx>, rvalue: &Rvalue<'tcx>, location: Location) {
self.super_assign(place, rvalue, location); self.super_assign(place, rvalue, location);
let Some(()) = self.check_rvalue(rvalue) else { return }; let Some(()) = self.check_rvalue(rvalue) else {
trace!("rvalue check failed, removing const");
Self::remove_const(&mut self.ecx, place.local);
return;
};
match self.ecx.machine.can_const_prop[place.local] { match self.ecx.machine.can_const_prop[place.local] {
// Do nothing if the place is indirect. // Do nothing if the place is indirect.

3
tests/mir-opt/const_prop/issue_118328.size_of.ConstProp.diff
View File

@ -12,8 +12,7 @@
StorageLive(_1); StorageLive(_1);
_1 = const 0_usize; _1 = const 0_usize;
_1 = const _; _1 = const _;
- _0 = _1; _0 = _1;
+ _0 = const 0_usize;
StorageDead(_1); StorageDead(_1);
return; return;
} }