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

Merge DerefArgVisitor and PinArgVisitor.

Browse Source 
They are almost identical, differing only in the `ProjectionElem` they
insert. This commit merges them into a new type `SelfArgVisitor`.
This commit is contained in:
Nicholas Nethercote 2024-08-28 13:08:02 +10:00
parent 5331280a2b
commit d7cb1181dc
1 changed files with 7 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
compiler/rustc_mir_transform/src/coroutine.rs
View File

@ -112,11 +112,12 @@ fn visit_terminator(&mut self, terminator: &mut Terminator<'tcx>, location: Loca
} }
} }
struct DerefArgVisitor<'tcx> { struct SelfArgVisitor<'tcx> {
elem: ProjectionElem<Local, Ty<'tcx>>,
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
} }
impl<'tcx> MutVisitor<'tcx> for DerefArgVisitor<'tcx> { impl<'tcx> MutVisitor<'tcx> for SelfArgVisitor<'tcx> {
fn tcx(&self) -> TyCtxt<'tcx> { fn tcx(&self) -> TyCtxt<'tcx> {
self.tcx self.tcx
} }
@ -129,49 +130,7 @@ fn visit_place(&mut self, place: &mut Place<'tcx>, context: PlaceContext, locati
if place.local == SELF_ARG { if place.local == SELF_ARG {
replace_base( replace_base(
place, place,
Place { Place { local: SELF_ARG, projection: self.tcx().mk_place_elems(&[self.elem]) },
local: SELF_ARG,
projection: self.tcx().mk_place_elems(&[ProjectionElem::Deref]),
},
self.tcx,
);
} else {
self.visit_local(&mut place.local, context, location);
for elem in place.projection.iter() {
if let PlaceElem::Index(local) = elem {
assert_ne!(local, SELF_ARG);
}
}
}
}
}
struct PinArgVisitor<'tcx> {
ref_coroutine_ty: Ty<'tcx>,
tcx: TyCtxt<'tcx>,
}
impl<'tcx> MutVisitor<'tcx> for PinArgVisitor<'tcx> {
fn tcx(&self) -> TyCtxt<'tcx> {
self.tcx
}
fn visit_local(&mut self, local: &mut Local, _: PlaceContext, _: Location) {
assert_ne!(*local, SELF_ARG);
}
fn visit_place(&mut self, place: &mut Place<'tcx>, context: PlaceContext, location: Location) {
if place.local == SELF_ARG {
replace_base(
place,
Place {
local: SELF_ARG,
projection: self.tcx().mk_place_elems(&[ProjectionElem::Field(
FieldIdx::ZERO,
self.ref_coroutine_ty,
)]),
},
self.tcx, self.tcx,
); );
} else { } else {
@ -568,7 +527,7 @@ fn make_coroutine_state_argument_indirect<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Bo
body.local_decls.raw[1].ty = ref_coroutine_ty; body.local_decls.raw[1].ty = ref_coroutine_ty;
// Add a deref to accesses of the coroutine state // Add a deref to accesses of the coroutine state
DerefArgVisitor { tcx }.visit_body(body); SelfArgVisitor { tcx, elem: ProjectionElem::Deref }.visit_body(body);
} }
fn make_coroutine_state_argument_pinned<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) { fn make_coroutine_state_argument_pinned<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
@ -583,7 +542,8 @@ fn make_coroutine_state_argument_pinned<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body
body.local_decls.raw[1].ty = pin_ref_coroutine_ty; body.local_decls.raw[1].ty = pin_ref_coroutine_ty;
// Add the Pin field access to accesses of the coroutine state // Add the Pin field access to accesses of the coroutine state
PinArgVisitor { ref_coroutine_ty, tcx }.visit_body(body); SelfArgVisitor { tcx, elem: ProjectionElem::Field(FieldIdx::ZERO, ref_coroutine_ty) }
.visit_body(body);
} }
/// Allocates a new local and replaces all references of `local` with it. Returns the new local. /// Allocates a new local and replaces all references of `local` with it. Returns the new local.