Skip to content

Commit 776afd3

Browse files
authored
Rollup merge of rust-lang#122028 - oli-obk:drop_in_place_leftovers, r=compiler-errors
Remove some dead code drop_in_place has been a lang item, not an intrinsic, for forever
2 parents 8f0b1e4 + 5a16aeb commit 776afd3

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

compiler/rustc_codegen_ssa/src/mir/block.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
852852
}
853853

854854
let instance = match intrinsic {
855-
None | Some(ty::IntrinsicDef { name: sym::drop_in_place, .. }) => instance,
855+
None => instance,
856856
Some(intrinsic) => {
857857
let mut llargs = Vec::with_capacity(1);
858858
let ret_dest = self.make_return_dest(

compiler/rustc_hir_analysis/src/check/intrinsic.rs

-1
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@ pub fn check_intrinsic_type(
248248
],
249249
Ty::new_unit(tcx),
250250
),
251-
sym::drop_in_place => (1, 0, vec![Ty::new_mut_ptr(tcx, param(0))], Ty::new_unit(tcx)),
252251
sym::needs_drop => (1, 0, vec![], tcx.types.bool),
253252

254253
sym::type_name => (1, 0, vec![], Ty::new_static_str(tcx)),

0 commit comments

Comments
 (0)