Skip to content

Only run MaybeInitializedPlaces dataflow once to elaborate drops #111555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 17 commits into from
Aug 17, 2023
Merged

Only run MaybeInitializedPlaces dataflow once to elaborate drops #111555

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9c97abd
Simplify for_each_mut_borrow.
cjgillot May 6, 2023
760881b
Create bottom on-the-fly instead of cloning it.
cjgillot May 6, 2023
8726cbc
Move initialization dataflow impls into their own module.
cjgillot May 6, 2023
934a99e
Move domain_size to GenKillAnalysis.
cjgillot May 6, 2023
32711b2
Introduce MaybeUnreachable.
cjgillot May 6, 2023
5173d85
Allow apply_terminator_effect to customize edges.
cjgillot May 7, 2023
3acfa09
Only run MaybeInitializedPlaces once for drop elaboration.
cjgillot May 6, 2023
f19cd3f
Use TerminatorEdge for dataflow-const-prop.
cjgillot May 7, 2023
6cf15d4
Rename MaybeUnreachable.
cjgillot May 19, 2023
388f6a6
Make TerminatorEdge plural.
cjgillot May 27, 2023
aa697f5
Rename YieldResumeEffect.
cjgillot May 27, 2023
7ded340
Specify that method only applies statement effects.
cjgillot May 27, 2023
e9990ce
Only evaluate yield place after resume in liveness.
cjgillot May 27, 2023
b8fed2f
Make dataflow const-prop handle_switch_int monotonic.
cjgillot May 29, 2023
94c5ea3
Update doc comment.
cjgillot Aug 16, 2023
f5e4eb9
Use Terminator::edges for backward analysis too.
cjgillot Aug 16, 2023
5b2524e
Do not pre-compute reachable blocks.
cjgillot Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Only evaluate yield place after resume in liveness.
  • Loading branch information
@cjgillot
cjgillot committed Aug 16, 2023
commit e9990ce89ca62e9c9b62bcde89eb11314ec1dc22
46 changes: 31 additions & 15 deletions compiler/rustc_mir_dataflow/src/impls/liveness.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,19 @@ impl<'tcx> GenKillAnalysis<'tcx> for MaybeLiveLocals {
_block: mir::BasicBlock,
return_places: CallReturnPlaces<'_, 'tcx>,
) {
return_places.for_each(|place| {
CallReturnEffect(trans).visit_place(
&place,
PlaceContext::MutatingUse(MutatingUseContext::Store),
if let CallReturnPlaces::Yield(resume_place) = return_places {
YieldResumeEffect(trans).visit_place(
Comment thread
tmiasko marked this conversation as resolved.
Outdated
&resume_place,
PlaceContext::MutatingUse(MutatingUseContext::Yield),
Location::START,
)
});
} else {
return_places.for_each(|place| {
if let Some(local) = place.as_local() {
trans.kill(local);
}
});
}
}
}

Expand All @@ -91,12 +97,16 @@ where
T: GenKill<Local>,
{
fn visit_place(&mut self, place: &mir::Place<'tcx>, context: PlaceContext, location: Location) {
if let PlaceContext::MutatingUse(MutatingUseContext::Yield) = context {
// The resume place is evaluated and assigned to only after generator resumes, so its
// effect is handled separately in `call_resume_effect`.
return;
}

match DefUse::for_place(*place, context) {
Some(DefUse::Def) => {
if let PlaceContext::MutatingUse(
MutatingUseContext::Yield
| MutatingUseContext::Call
| MutatingUseContext::AsmOutput,
MutatingUseContext::Call | MutatingUseContext::AsmOutput,
) = context
{
// For the associated terminators, this is only a `Def` when the terminator returns
Expand All @@ -119,9 +129,9 @@ where
}
}

struct CallReturnEffect<'a, T>(&'a mut T);
struct YieldResumeEffect<'a, T>(&'a mut T);

impl<'tcx, T> Visitor<'tcx> for CallReturnEffect<'_, T>
impl<'tcx, T> Visitor<'tcx> for YieldResumeEffect<'_, T>
where
T: GenKill<Local>,
{
Expand Down Expand Up @@ -291,12 +301,18 @@ impl<'a, 'tcx> Analysis<'tcx> for MaybeTransitiveLiveLocals<'a> {
_block: mir::BasicBlock,
return_places: CallReturnPlaces<'_, 'tcx>,
) {
return_places.for_each(|place| {
CallReturnEffect(trans).visit_place(
&place,
PlaceContext::MutatingUse(MutatingUseContext::Store),
if let CallReturnPlaces::Yield(resume_place) = return_places {
YieldResumeEffect(trans).visit_place(
&resume_place,
PlaceContext::MutatingUse(MutatingUseContext::Yield),
Location::START,
)
});
} else {
return_places.for_each(|place| {
if let Some(local) = place.as_local() {
trans.remove(local);
}
});
}
}
}