Skip to content

Allow multiple derefs to be splitted in deref_separator #95857

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 2 commits into from
Apr 10, 2022
Merged

Allow multiple derefs to be splitted in deref_separator #95857

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc57656
support multiple derefs
ouz-a Apr 9, 2022
80afd9d
remove the if block
ouz-a Apr 9, 2022
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
remove the if block
  • Loading branch information
@ouz-a
ouz-a committed Apr 9, 2022
commit 80afd9db2e3871387ecab9c2bdeffc0f970d32d3
31 changes: 9 additions & 22 deletions compiler/rustc_mir_transform/src/deref_separator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,29 +26,16 @@ pub fn deref_finder<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {

// We are adding current p_ref's projections to our
// temp value, excluding projections we already covered.
if idx == 1 {
let deref_place = Place::from(place_local)
.project_deeper(&p_ref.projection[last_len..], tcx);
patch.add_assign(
loc,
Place::from(temp),
Rvalue::Use(Operand::Move(deref_place)),
);
let deref_place = Place::from(place_local)
.project_deeper(&p_ref.projection[last_len..], tcx);
patch.add_assign(
loc,
Place::from(temp),
Rvalue::Use(Operand::Move(deref_place)),
);

place_local = temp;
last_len = p_ref.projection.len();
} else {
let deref_place = Place::from(place_local)
.project_deeper(&p_ref.projection[last_len..], tcx);
patch.add_assign(
loc,
Place::from(temp),
Rvalue::Use(Operand::Move(deref_place)),
);

place_local = temp;
last_len = p_ref.projection.len();
}
place_local = temp;
last_len = p_ref.projection.len();

// We are creating a place by using our temp value's location
// and copying derefed values which we need to create new statement.
Expand Down