Auto merge of #155044 - WaffleLapkin:dont-remove-unneeded-drops, r=<try>

Don't try to remove `drop_in_place` calls in `RemoveUnneededDrops`

Author: bors

compiler/rustc_mir_transform/src/remove_unneeded_drops.rs

@@ -4,13 +4,7 @@
 //! useful because (unlike MIR building) it runs after type checking, so it can make use of
 //! `TypingMode::PostAnalysis` to provide more precise type information, especially about opaque
 //! types.
-//!
-//! When we're optimizing, we also remove calls to `drop_in_place<T>` when `T` isn't `needs_drop`,
-//! as those are essentially equivalent to `Drop` terminators. While the compiler doesn't insert
-//! them automatically, preferring the built-in instead, they're common in generic code (such as
-//! `Vec::truncate`) so removing them from things like inlined `Vec<u8>` is helpful.
 
-use rustc_hir::LangItem;
 use rustc_middle::mir::*;
 use rustc_middle::ty::TyCtxt;
 use tracing::{debug, trace};
@@ -27,19 +21,8 @@ impl<'tcx> crate::MirPass<'tcx> for RemoveUnneededDrops {
         let mut should_simplify = false;
         for block in body.basic_blocks.as_mut() {
             let terminator = block.terminator_mut();
-            let (ty, target) = match terminator.kind {
-                TerminatorKind::Drop { place, target, .. } => {
-                    (place.ty(&body.local_decls, tcx).ty, target)
-                }
-                TerminatorKind::Call { ref func, target: Some(target), .. }
-                    if tcx.sess.mir_opt_level() > 0
-                        && let Some((def_id, generics)) = func.const_fn_def()
-                        && tcx.is_lang_item(def_id, LangItem::DropInPlace) =>
-                {
-                    (generics.type_at(0), target)
-                }
-                _ => continue,
-            };
+            let TerminatorKind::Drop { place, target, .. } = terminator.kind else { continue };
+            let ty = place.ty(&body.local_decls, tcx).ty;
 
             if ty.needs_drop(tcx, typing_env) {
                 continue;

…mir-opt/remove_unneeded_drop_in_place.rs …mir-opt/inline/inline_empty_drop_glue.rstests/mir-opt/remove_unneeded_drop_in_place.rs renamed to tests/mir-opt/inline/inline_empty_drop_glue.rs tests/mir-opt/remove_unneeded_drop_in_place.rs renamed to tests/mir-opt/inline/inline_empty_drop_glue.rs

@@ -1,12 +1,12 @@
-//@ test-mir-pass: RemoveUnneededDrops
+//@ test-mir-pass: Inline
 //@ needs-unwind
-//@ compile-flags: -Z mir-opt-level=1
+//@ compile-flags: -Zmir-opt-level=1
 
-// EMIT_MIR remove_unneeded_drop_in_place.slice_in_place.RemoveUnneededDrops.diff
+// EMIT_MIR inline_empty_drop_glue.slice_in_place.Inline.diff
 unsafe fn slice_in_place(ptr: *mut [char]) {
     // CHECK-LABEL: fn slice_in_place(_1: *mut [char])
-    // CHECK: bb0: {
-    // CHECK-NEXT: return;
+    // CHECK:      bb0: {
+    // CHECK-NEXT:   return;
     // CHECK-NEXT: }
     std::ptr::drop_in_place(ptr)
 }

….slice_in_place.RemoveUnneededDrops.diff …pty_drop_glue.slice_in_place.Inline.difftests/mir-opt/remove_unneeded_drop_in_place.slice_in_place.RemoveUnneededDrops.diff renamed to tests/mir-opt/inline/inline_empty_drop_glue.slice_in_place.Inline.diff tests/mir-opt/remove_unneeded_drop_in_place.slice_in_place.RemoveUnneededDrops.diff renamed to tests/mir-opt/inline/inline_empty_drop_glue.slice_in_place.Inline.diff

@@ -1,10 +1,12 @@
-- // MIR for `slice_in_place` before RemoveUnneededDrops
-+ // MIR for `slice_in_place` after RemoveUnneededDrops
+- // MIR for `slice_in_place` before Inline
++ // MIR for `slice_in_place` after Inline
 
   fn slice_in_place(_1: *mut [char]) -> () {
       debug ptr => _1;
       let mut _0: ();
       let mut _2: *mut [char];
++     scope 1 (inlined drop_in_place::<[char]> - shim(None)) {
++     }
 
       bb0: {
           StorageLive(_2);