Commit 7d9c3ee

committed

Introduce PlaceContext::may_observe_address.

1 parent 87eb56c commit 7d9c3eeCopy full SHA for 7d9c3ee

File tree

+22

-8

lines changed

+22

-8

lines changed

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1415,6 +1415,23 @@ impl PlaceContext {`
`1415`	`1415`	`)`
`1416`	`1416`	`}`
`1417`	`1417`
	`1418`	+ /// Returns `true` if this place context may be used to know the address of the given place.
	`1419`	`+ pub fn may_observe_address(self) -> bool {`
	`1420`	`+ matches!(`
	`1421`	`+ self,`
	`1422`	`+ PlaceContext::NonMutatingUse(`
	`1423`	`+ NonMutatingUseContext::SharedBorrow`
	`1424`	`+ \| NonMutatingUseContext::RawBorrow`
	`1425`	`+ \| NonMutatingUseContext::FakeBorrow`
	`1426`	`+ ) \| PlaceContext::MutatingUse(`
	`1427`	`+ MutatingUseContext::Drop`
	`1428`	`+ \| MutatingUseContext::Borrow`
	`1429`	`+ \| MutatingUseContext::RawBorrow`
	`1430`	`+ \| MutatingUseContext::AsmOutput`
	`1431`	`+ )`
	`1432`	`+ )`
	`1433`	`+ }`
	`1434`	`+`
`1418`	`1435`	/// Returns `true` if this place context represents a storage live or storage dead marker.
`1419`	`1436`	`#[inline]`
`1420`	`1437`	`pub fn is_storage_marker(self) -> bool {`

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ use rustc_data_structures::fx::{FxHashMap, FxIndexSet, StdEntry};`
`6`	`6`	`use rustc_data_structures::stack::ensure_sufficient_stack;`
`7`	`7`	`use rustc_index::IndexVec;`
`8`	`8`	`use rustc_index::bit_set::DenseBitSet;`
`9`		`-use rustc_middle::mir::visit::{MutatingUseContext,PlaceContext, Visitor};`
	`9`	`+use rustc_middle::mir::visit::{PlaceContext, Visitor};`
`10`	`10`	`use rustc_middle::mir::*;`
`11`	`11`	`use rustc_middle::ty::{self, Ty, TyCtxt};`
`12`	`12`	`use tracing::debug;`
`@@ -917,12 +917,7 @@ pub fn excluded_locals(body: &Body<'_>) -> DenseBitSet<Local> {`
`917`	`917`
`918`	`918`	`impl<'tcx> Visitor<'tcx> for Collector {`
`919`	`919`	`fn visit_place(&mut self, place: &Place<'tcx>, context: PlaceContext, _location: Location) {`
`920`		`- if (context.is_borrow()`
`921`		`- \|\| context.is_address_of()`
`922`		`- \|\| context.is_drop()`
`923`		`- \|\| context == PlaceContext::MutatingUse(MutatingUseContext::AsmOutput))`
`924`		`- && !place.is_indirect()`
`925`		`- {`
	`920`	`+ if context.may_observe_address() && !place.is_indirect() {`
`926`	`921`	`// A pointer to a place could be used to access other places with the same local,`
`927`	`922`	`// hence we have to exclude the local completely.`
`928`	`923`	`self.result.insert(place.local);`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,9 @@ impl SsaVisitor<'_, '_> {`
`225`	`225`
`226`	`226`	`impl<'tcx> Visitor<'tcx> for SsaVisitor<'_, 'tcx> {`
`227`	`227`	`fn visit_local(&mut self, local: Local, ctxt: PlaceContext, loc: Location) {`
	`228`	`+ if ctxt.may_observe_address() {`
	`229`	`+ self.borrowed_locals.insert(local);`
	`230`	`+ }`
`228`	`231`	`match ctxt {`
`229`	`232`	`PlaceContext::MutatingUse(MutatingUseContext::Projection)`
`230`	`233`	`\| PlaceContext::NonMutatingUse(NonMutatingUseContext::Projection) => bug!(),`
`@@ -237,7 +240,6 @@ impl<'tcx> Visitor<'tcx> for SsaVisitor<'_, 'tcx> {`
`237`	`240`	`PlaceContext::NonMutatingUse(`
`238`	`241`	`NonMutatingUseContext::SharedBorrow \| NonMutatingUseContext::FakeBorrow,`
`239`	`242`	`) => {`
`240`		`- self.borrowed_locals.insert(local);`
`241`	`243`	`self.check_dominates(local, loc);`
`242`	`244`	`self.direct_uses[local] += 1;`
`243`	`245`	`}`

Comments

(0)