bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

match on elem first

Browse source
This commit is contained in:
ouz-a 2023-09-12 10:28:37 +03:00
parent 6c03617142
commit 22b1acb455
1 changed files with 45 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

78
compiler/rustc_mir_dataflow/src/move_paths/builder.rs
View file

@ -115,44 +115,56 @@ impl<'b, 'a, 'tcx> Gatherer<'b, 'a, 'tcx> {
let body = self.builder.body; let body = self.builder.body;
let tcx = self.builder.tcx; let tcx = self.builder.tcx;
let place_ty = place_ref.ty(body, tcx).ty; let place_ty = place_ref.ty(body, tcx).ty;
match place_ty.kind() { match elem {
ty::Ref(..) | ty::RawPtr(..) => { ProjectionElem::Deref => match place_ty.kind() {
return Err(MoveError::cannot_move_out_of( ty::Ref(..) | ty::RawPtr(..) => {
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 {
return Err(MoveError::cannot_move_out_of( return Err(MoveError::cannot_move_out_of(
self.loc, self.loc,
InteriorOfSliceOrArray { ty: place_ty, is_index: true }, BorrowedContent {
target_place: place_ref.project_deeper(&[elem], tcx),
},
)); ));
} }
} _ => (),
},
_ => {} ProjectionElem::Field(_, _)
}; | ProjectionElem::OpaqueCast(_)
| ProjectionElem::Downcast(_, _) => match place_ty.kind() {
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);
}
_ => (),
},
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 },
));
}
}
_ => (),
},
}
if union_path.is_none() { if union_path.is_none() {
// inlined from add_move_path because of a borrowck conflict with the iterator // inlined from add_move_path because of a borrowck conflict with the iterator
base = base =