mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only check that StorageLive dominates address-taking.

Browse Source
This commit is contained in:
Camille GILLOT 2023-04-30 09:55:24 +00:00
parent 0bd9bd6b8a
commit 3268f2e61d
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/rustc_mir_transform/src/ssa.rs
View File

@ -7,7 +7,7 @@
//! //!
//! We say a local has a stable address if its address has SSA-like properties: //! We say a local has a stable address if its address has SSA-like properties:
//! 1/ It has a single `StorageLive` statement, or none at all (always-live); //! 1/ It has a single `StorageLive` statement, or none at all (always-live);
//! 2/ All its uses dominate this `StorageLive` statement. //! 2/ This `StorageLive` statement dominates all statements that take this local's address.
//! //!
//! We do not discard borrowed locals from this analysis, as we cannot take their address' address. //! We do not discard borrowed locals from this analysis, as we cannot take their address' address.
@ -247,7 +247,6 @@ fn visit_local(&mut self, local: Local, ctxt: PlaceContext, loc: Location) {
// Only record if SSA-like, to avoid growing the vector needlessly. // Only record if SSA-like, to avoid growing the vector needlessly.
self.assignment_order.push(local); self.assignment_order.push(local);
} }
self.dominators.check_dominates(&mut self.storage_live[local], loc);
} }
// Anything can happen with raw pointers, so remove them. // Anything can happen with raw pointers, so remove them.
// We do not verify that all uses of the borrow dominate the assignment to `local`, // We do not verify that all uses of the borrow dominate the assignment to `local`,
@ -264,7 +263,6 @@ fn visit_local(&mut self, local: Local, ctxt: PlaceContext, loc: Location) {
} }
PlaceContext::NonMutatingUse(_) => { PlaceContext::NonMutatingUse(_) => {
self.dominators.check_dominates(&mut self.assignments[local], loc); self.dominators.check_dominates(&mut self.assignments[local], loc);
self.dominators.check_dominates(&mut self.storage_live[local], loc);
self.direct_uses[local] += 1; self.direct_uses[local] += 1;
} }
PlaceContext::NonUse(NonUseContext::StorageLive) => { PlaceContext::NonUse(NonUseContext::StorageLive) => {
@ -283,7 +281,6 @@ fn visit_place(&mut self, place: &Place<'tcx>, ctxt: PlaceContext, loc: Location
self.visit_projection(place.as_ref(), new_ctxt, loc); self.visit_projection(place.as_ref(), new_ctxt, loc);
self.dominators.check_dominates(&mut self.assignments[place.local], loc); self.dominators.check_dominates(&mut self.assignments[place.local], loc);
self.dominators.check_dominates(&mut self.storage_live[place.local], loc);
} }
return; return;
} else { } else {