bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Consider CopyForDeref for DestProp.

Browse source
This commit is contained in:
Camille GILLOT 2022-12-29 19:15:00 +00:00
parent 8f7e441a54
commit 982726cdc4
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_mir_transform/src/dest_prop.rs
View file

@ -328,7 +328,8 @@ impl<'a, 'tcx> MutVisitor<'tcx> for Merger<'a, 'tcx> {
match &statement.kind { match &statement.kind {
StatementKind::Assign(box (dest, rvalue)) => { StatementKind::Assign(box (dest, rvalue)) => {
match rvalue { match rvalue {
Rvalue::Use(Operand::Copy(place) | Operand::Move(place)) => { Rvalue::CopyForDeref(place)
| Rvalue::Use(Operand::Copy(place) | Operand::Move(place)) => {
// These might've been turned into self-assignments by the replacement // These might've been turned into self-assignments by the replacement
// (this includes the original statement we wanted to eliminate). // (this includes the original statement we wanted to eliminate).
if dest == place { if dest == place {
@ -754,7 +755,7 @@ impl<'tcx> Visitor<'tcx> for FindAssignments<'_, '_, 'tcx> {
fn visit_statement(&mut self, statement: &Statement<'tcx>, _: Location) { fn visit_statement(&mut self, statement: &Statement<'tcx>, _: Location) {
if let StatementKind::Assign(box ( if let StatementKind::Assign(box (
lhs, lhs,
Rvalue::Use(Operand::Copy(rhs) | Operand::Move(rhs)), Rvalue::CopyForDeref(rhs) | Rvalue::Use(Operand::Copy(rhs) | Operand::Move(rhs)),
)) = &statement.kind )) = &statement.kind
{ {
let Some((src, dest)) = places_to_candidate_pair(*lhs, *rhs, self.body) else { let Some((src, dest)) = places_to_candidate_pair(*lhs, *rhs, self.body) else {