bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #108856 - Zeegomo:remove-drop-and-rep, r=tmiasko

Browse source 
Remove DropAndReplace terminator

#107844 made DropAndReplace unused, let's remove it completely from the codebase.
This commit is contained in:
Matthias Krüger 2023-03-08 21:26:51 +01:00 • committed by GitHub
commit 4e84fbf8a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
48 changed files with 33 additions and 344 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_const_eval/src/transform/validate.rs
View file

@ -846,18 +846,6 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> {
self.check_edge(location, *unwind, EdgeKind::Unwind);
}
}
TerminatorKind::DropAndReplace { target, unwind, .. } => {
if self.mir_phase >= MirPhase::Runtime(RuntimePhase::Initial) {
self.fail(
location,
"`DropAndReplace` should have been removed during drop elaboration",
);
}
self.check_edge(location, *target, EdgeKind::Normal);
if let Some(unwind) = unwind {
self.check_edge(location, *unwind, EdgeKind::Unwind);
}
}
TerminatorKind::Call { func, args, destination, target, cleanup, .. } => {
let func_ty = func.ty(&self.body.local_decls, self.tcx);
match func_ty.kind() {