bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Remove both StorageLive and StorageDead in CopyProp.

Browse source
This commit is contained in:
Camille GILLOT 2023-01-31 16:49:01 +00:00
parent 05ee406cc8
commit 3c10cf088a
19 changed files with 24 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

25
compiler/rustc_mir_transform/src/copy_prop.rs
View file

@ -162,17 +162,20 @@ impl<'tcx> MutVisitor<'tcx> for Replacer<'_, 'tcx> {
}
fn visit_statement(&mut self, stmt: &mut Statement<'tcx>, loc: Location) {
if let StatementKind::StorageDead(l) = stmt.kind
&& self.storage_to_remove.contains(l)
{
stmt.make_nop();
} else if let StatementKind::Assign(box (ref place, ref mut rvalue)) = stmt.kind
&& place.as_local().is_some()
{
// Do not replace assignments.
self.visit_rvalue(rvalue, loc)
} else {
self.super_statement(stmt, loc);
match stmt.kind {
// When removing storage statements, we need to remove both (#107511).
StatementKind::StorageLive(l) | StatementKind::StorageDead(l)
if self.storage_to_remove.contains(l) =>
{
stmt.make_nop()
}
StatementKind::Assign(box (ref place, ref mut rvalue))
if place.as_local().is_some() =>
{
// Do not replace assignments.
self.visit_rvalue(rvalue, loc)
}
_ => self.super_statement(stmt, loc),
}
}
}