OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #63299 - spastorino:in-projection-use-ref, r=oli-obk

Browse Source 
Make qualify consts in_projection use PlaceRef

r? @oli-obk
This commit is contained in:
Mazdak Farrokhzad 2019-08-06 08:17:50 +02:00 committed by GitHub
commit 5a3359d7cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/librustc_mir/transform/qualify_consts.rs
View File

@ -182,16 +182,17 @@ trait Qualif {
fn in_projection_structurally(
cx: &ConstCx<'_, 'tcx>,
base: &PlaceBase<'tcx>,
proj: &Projection<'tcx>,
place: PlaceRef<'_, 'tcx>,
) -> bool {
let proj = place.projection.as_ref().unwrap();
let base_qualif = Self::in_place(cx, PlaceRef {
base,
base: place.base,
projection: &proj.base,
});
let qualif = base_qualif && Self::mask_for_ty(
cx,
Place::ty_from(&base, &proj.base, cx.body, cx.tcx)
Place::ty_from(place.base, &proj.base, cx.body, cx.tcx)
.projection_ty(cx.tcx, &proj.elem)
.ty,
);
@ -208,10 +209,9 @@ trait Qualif {
fn in_projection(
cx: &ConstCx<'_, 'tcx>,
base: &PlaceBase<'tcx>,
proj: &Projection<'tcx>,
place: PlaceRef<'_, 'tcx>,
) -> bool {
Self::in_projection_structurally(cx, base, proj)
Self::in_projection_structurally(cx, place)
}
fn in_place(cx: &ConstCx<'_, 'tcx>, place: PlaceRef<'_, 'tcx>) -> bool {
@ -234,9 +234,9 @@ trait Qualif {
Self::in_static(cx, static_)
},
PlaceRef {
base,
projection: Some(proj),
} => Self::in_projection(cx, base, proj),
base: _,
projection: Some(_),
} => Self::in_projection(cx, place),
}
}
@ -448,9 +448,10 @@ impl Qualif for IsNotPromotable {
fn in_projection(
cx: &ConstCx<'_, 'tcx>,
base: &PlaceBase<'tcx>,
proj: &Projection<'tcx>,
place: PlaceRef<'_, 'tcx>,
) -> bool {
let proj = place.projection.as_ref().unwrap();
match proj.elem {
ProjectionElem::Deref |
ProjectionElem::Downcast(..) => return true,
@ -461,7 +462,7 @@ impl Qualif for IsNotPromotable {
ProjectionElem::Field(..) => {
if cx.mode == Mode::NonConstFn {
let base_ty = Place::ty_from(base, &proj.base, cx.body, cx.tcx).ty;
let base_ty = Place::ty_from(place.base, &proj.base, cx.body, cx.tcx).ty;
if let Some(def) = base_ty.ty_adt_def() {
// No promotion of union field accesses.
if def.is_union() {
@ -472,7 +473,7 @@ impl Qualif for IsNotPromotable {
}
}
Self::in_projection_structurally(cx, base, proj)
Self::in_projection_structurally(cx, place)
}
fn in_rvalue(cx: &ConstCx<'_, 'tcx>, rvalue: &Rvalue<'tcx>) -> bool {