user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't treat a reference to a static as a reborrow

Browse source 
They now look the same in the MIR after #66587.
This commit is contained in:
Dylan MacKenzie 2019-11-27 14:04:11 -08:00
parent 5b1e10b2f6
commit a70ac50ec4
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/librustc_mir/transform/check_consts/validation.rs
View file

@ -705,6 +705,19 @@ fn place_as_reborrow(
return None;
}
// A borrow of a `static` also looks like `&(*_1)` in the MIR, but `_1` is a `const`
// that points to the allocation for the static. Don't treat these as reborrows.
if let PlaceBase::Local(local) = place.base {
let decl = &body.local_decls[local];
if let LocalInfo::StaticRef { .. } = decl.local_info {
return None;
}
}
// Ensure the type being derefed is a reference and not a raw pointer.
//
// This is sufficient to prevent an access to a `static mut` from being marked as a
// reborrow, even if the check above were to disappear.
let inner_ty = Place::ty_from(&place.base, inner, body, tcx).ty;
match inner_ty.kind {
ty::Ref(..) => Some(inner),