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

Merge borrowed locals too.

Browse source
This commit is contained in:
Camille GILLOT 2024-01-02 23:04:52 +00:00
parent 308cc76510
commit 73db12a223
5 changed files with 85 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -111,7 +111,10 @@ impl<'tcx> MutVisitor<'tcx> for Replacer<'_, 'tcx> {
fn visit_local(&mut self, local: &mut Local, ctxt: PlaceContext, _: Location) {
let new_local = self.copy_classes[*local];
if self.borrowed_locals.contains(*local) || self.borrowed_locals.contains(new_local) {
// We must not unify two locals that are borrowed. But this is fine if one is borrowed and
// the other is not. We chose to check the original local, and not the target. That way, if
// the original local is borrowed and the target is not, we do not pessimize the whole class.
if self.borrowed_locals.contains(*local) {
return;
}
match ctxt {