bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

use option<PlaceRef<'tcx>> to clean up mir code a little

Browse source
This commit is contained in:
Henry Boisdequin 2021-02-14 14:39:24 +05:30
parent 1279b3b923
commit eace240ebe
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_middle/src/mir/mod.rs
View file

@ -962,8 +962,7 @@ impl<'tcx> LocalDecl<'tcx> {
opt_ty_info: _, opt_ty_info: _,
opt_match_place: _, opt_match_place: _,
pat_span: _, pat_span: _,
}) }) | BindingForm::ImplicitSelf(ImplicitSelfKind::Imm),
| BindingForm::ImplicitSelf(ImplicitSelfKind::Imm),
))) )))
) )
} }
@ -980,8 +979,7 @@ impl<'tcx> LocalDecl<'tcx> {
opt_ty_info: _, opt_ty_info: _,
opt_match_place: _, opt_match_place: _,
pat_span: _, pat_span: _,
}) }) | BindingForm::ImplicitSelf(_),
| BindingForm::ImplicitSelf(_),
))) )))
) )
} }

19
compiler/rustc_mir/src/transform/check_consts/validation.rs
View file

@ -492,7 +492,7 @@ impl Visitor<'tcx> for Validator<'mir, 'tcx> {
// Special-case reborrows to be more like a copy of a reference. // Special-case reborrows to be more like a copy of a reference.
match *rvalue { match *rvalue {
Rvalue::Ref(_, kind, place) => { Rvalue::Ref(_, kind, place) => {
if let Some(reborrowed_proj) = place_as_reborrow(self.tcx, self.body, place) { if let Some(place_ref) = place_as_reborrow(self.tcx, self.body, place) {
let ctx = match kind { let ctx = match kind {
BorrowKind::Shared => { BorrowKind::Shared => {
PlaceContext::NonMutatingUse(NonMutatingUseContext::SharedBorrow) PlaceContext::NonMutatingUse(NonMutatingUseContext::SharedBorrow)
@ -508,12 +508,12 @@ impl Visitor<'tcx> for Validator<'mir, 'tcx> {
} }
}; };
self.visit_local(&place.local, ctx, location); self.visit_local(&place.local, ctx, location);
self.visit_projection(place.local, reborrowed_proj, ctx, location); self.visit_projection(place.local, place_ref.projection, ctx, location);
return; return;
} }
} }
Rvalue::AddressOf(mutbl, place) => { Rvalue::AddressOf(mutbl, place) => {
if let Some(reborrowed_proj) = place_as_reborrow(self.tcx, self.body, place) { if let Some(place_ref) = place_as_reborrow(self.tcx, self.body, place) {
let ctx = match mutbl { let ctx = match mutbl {
Mutability::Not => { Mutability::Not => {
PlaceContext::NonMutatingUse(NonMutatingUseContext::AddressOf) PlaceContext::NonMutatingUse(NonMutatingUseContext::AddressOf)
@ -521,7 +521,7 @@ impl Visitor<'tcx> for Validator<'mir, 'tcx> {
Mutability::Mut => PlaceContext::MutatingUse(MutatingUseContext::AddressOf), Mutability::Mut => PlaceContext::MutatingUse(MutatingUseContext::AddressOf),
}; };
self.visit_local(&place.local, ctx, location); self.visit_local(&place.local, ctx, location);
self.visit_projection(place.local, reborrowed_proj, ctx, location); self.visit_projection(place.local, place_ref.projection, ctx, location);
return; return;
} }
} }
@ -1016,7 +1016,7 @@ fn place_as_reborrow(
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
body: &Body<'tcx>, body: &Body<'tcx>,
place: Place<'tcx>, place: Place<'tcx>,
) -> Option<&'a [PlaceElem<'tcx>]> { ) -> Option<PlaceRef<'tcx>> {
match place.as_ref().last_projection() { match place.as_ref().last_projection() {
Some((place_base, ProjectionElem::Deref)) => { Some((place_base, ProjectionElem::Deref)) => {
// A borrow of a `static` also looks like `&(*_1)` in the MIR, but `_1` is a `const` // A borrow of a `static` also looks like `&(*_1)` in the MIR, but `_1` is a `const`
@ -1025,13 +1025,14 @@ fn place_as_reborrow(
None None
} else { } else {
// Ensure the type being derefed is a reference and not a raw pointer. // 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 // 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. // reborrow, even if the check above were to disappear.
let inner_ty = place_base.ty(body, tcx).ty; let inner_ty = place_base.ty(body, tcx).ty;
match inner_ty.kind() {
ty::Ref(..) => Some(place_base.projection), if let ty::Ref(..) = inner_ty.kind() {
_ => None, return Some(place_base);
} else {
return None;
} }
} }
} }