Skip to content
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

Jump to bottom

Match on elem first while building move paths #115770

Merged
merged 5 commits into from
Sep 22, 2023
Merged

Match on elem first while building move paths #115770

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
22b1acb
match on elem first
ouz-a Sep 12, 2023
0cb22a6
very verbose error handling
ouz-a Sep 12, 2023
d6efedc
remove inner match
ouz-a Sep 22, 2023
442c87a
better bug message
ouz-a Sep 22, 2023
63df126
match array for constantindex and subslice
ouz-a Sep 22, 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
78 changes: 45 additions & 33 deletions compiler/rustc_mir_dataflow/src/move_paths/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,44 +115,56 @@ impl<'b, 'a, 'tcx> Gatherer<'b, 'a, 'tcx> {
let body = self.builder.body;
let tcx = self.builder.tcx;
let place_ty = place_ref.ty(body, tcx).ty;
match place_ty.kind() {
ty::Ref(..) | ty::RawPtr(..) => {
return Err(MoveError::cannot_move_out_of(
self.loc,
BorrowedContent { target_place: place_ref.project_deeper(&[elem], tcx) },
));
}
ty::Adt(adt, _) if adt.has_dtor(tcx) && !adt.is_box() => {
return Err(MoveError::cannot_move_out_of(
self.loc,
InteriorOfTypeWithDestructor { container_ty: place_ty },
));
}
ty::Adt(adt, _) if adt.is_union() => {
union_path.get_or_insert(base);
}
ty::Slice(_) => {
return Err(MoveError::cannot_move_out_of(
self.loc,
InteriorOfSliceOrArray {
ty: place_ty,
is_index: matches!(elem, ProjectionElem::Index(..)),
},
));
}

ty::Array(..) => {
if let ProjectionElem::Index(..) = elem {
match elem {
ProjectionElem::Deref => match place_ty.kind() {
ty::Ref(..) | ty::RawPtr(..) => {
return Err(MoveError::cannot_move_out_of(
self.loc,
InteriorOfSliceOrArray { ty: place_ty, is_index: true },
BorrowedContent {
target_place: place_ref.project_deeper(&[elem], tcx),
},
));
}
}

_ => {}
};
_ => (),
ouz-a marked this conversation as resolved.
Show resolved Hide resolved
},
ProjectionElem::Field(_, _)
| ProjectionElem::OpaqueCast(_)
| ProjectionElem::Downcast(_, _) => match place_ty.kind() {
ouz-a marked this conversation as resolved.
Show resolved Hide resolved
ty::Adt(adt, _) if adt.has_dtor(tcx) && !adt.is_box() => {
ouz-a marked this conversation as resolved.
Show resolved Hide resolved
return Err(MoveError::cannot_move_out_of(
self.loc,
InteriorOfTypeWithDestructor { container_ty: place_ty },
));
}
ty::Adt(adt, _) if adt.is_union() => {
union_path.get_or_insert(base);
}

_ => (),
},
ProjectionElem::ConstantIndex { .. }
| ProjectionElem::Index(_)
| ProjectionElem::Subslice { .. } => match place_ty.kind() {
ty::Slice(_) => {
return Err(MoveError::cannot_move_out_of(
self.loc,
InteriorOfSliceOrArray {
ty: place_ty,
is_index: matches!(elem, ProjectionElem::Index(..)),
},
));
}
ty::Array(..) => {
if let ProjectionElem::Index(..) = elem {
return Err(MoveError::cannot_move_out_of(
self.loc,
InteriorOfSliceOrArray { ty: place_ty, is_index: true },
));
}
}
ouz-a marked this conversation as resolved.
Show resolved Hide resolved
_ => (),
ouz-a marked this conversation as resolved.
Show resolved Hide resolved
},
}
if union_path.is_none() {
// inlined from add_move_path because of a borrowck conflict with the iterator
base =
Expand Down
Loading