diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-03-05 22:10:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-05 22:10:03 +0100 |
| commit | 4f73d2a53c74428bd6e4fdda63b1dcc9fdf18353 (patch) | |
| tree | 6c1313a2d81e29bad38534013b230bb00637eb47 | |
| parent | b08837f180697b1441d1b9bc374a044d573b83ca (diff) | |
| parent | 5a16aebe9d83b5e7938ebd4ca7a17a0f44d7010c (diff) | |
| download | rust-4f73d2a53c74428bd6e4fdda63b1dcc9fdf18353.tar.gz rust-4f73d2a53c74428bd6e4fdda63b1dcc9fdf18353.zip | |
Rollup merge of #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
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/mir/block.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_hir_analysis/src/check/intrinsic.rs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_ssa/src/mir/block.rs b/compiler/rustc_codegen_ssa/src/mir/block.rs index 95a587b8181..b0efb646ef3 100644 --- a/compiler/rustc_codegen_ssa/src/mir/block.rs +++ b/compiler/rustc_codegen_ssa/src/mir/block.rs @@ -852,7 +852,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { } let instance = match intrinsic { - None | Some(ty::IntrinsicDef { name: sym::drop_in_place, .. }) => instance, + None => instance, Some(intrinsic) => { let mut llargs = Vec::with_capacity(1); let ret_dest = self.make_return_dest( diff --git a/compiler/rustc_hir_analysis/src/check/intrinsic.rs b/compiler/rustc_hir_analysis/src/check/intrinsic.rs index a8bf4d55191..95c51cc0486 100644 --- a/compiler/rustc_hir_analysis/src/check/intrinsic.rs +++ b/compiler/rustc_hir_analysis/src/check/intrinsic.rs @@ -248,7 +248,6 @@ pub fn check_intrinsic_type( ], Ty::new_unit(tcx), ), - sym::drop_in_place => (1, 0, vec![Ty::new_mut_ptr(tcx, param(0))], Ty::new_unit(tcx)), sym::needs_drop => (1, 0, vec![], tcx.types.bool), sym::type_name => (1, 0, vec![], Ty::new_static_str(tcx)), |