From 0bf75fbfc8812ed0c7dc827def29c9d65a438eac Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Sat, 12 Dec 2020 16:51:11 +0100
Subject: [PATCH] Use better symbol names for the drop glue

---
 compiler/rustc_symbol_mangling/src/legacy.rs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/compiler/rustc_symbol_mangling/src/legacy.rs b/compiler/rustc_symbol_mangling/src/legacy.rs
index eba8e1a0613f..60b60db64939 100644
--- a/compiler/rustc_symbol_mangling/src/legacy.rs
+++ b/compiler/rustc_symbol_mangling/src/legacy.rs
@@ -55,6 +55,26 @@ pub(super) fn mangle(
 
     let hash = get_symbol_hash(tcx, instance, instance_ty, instantiating_crate);
 
+    if let ty::InstanceDef::DropGlue(_drop_in_place, ty) = instance.def {
+        // Use `{{drop}}::<$TYPE>::$hash` as name for the drop glue instead of
+        // `core::mem::drop_in_place::$hash`.
+        let mut printer =
+            SymbolPrinter { tcx, path: SymbolPath::new(), keep_within_component: false };
+        printer.write_str("{{drop}}").unwrap();
+        printer.path.finalize_pending_component();
+        let printer = printer
+            .generic_delimiters(|mut printer| {
+                if let Some(ty) = ty {
+                    printer.print_type(ty)
+                } else {
+                    printer.write_str("_")?;
+                    Ok(printer)
+                }
+            })
+            .unwrap();
+        return printer.path.finish(hash);
+    }
+
     let mut printer = SymbolPrinter { tcx, path: SymbolPath::new(), keep_within_component: false }
         .print_def_path(def_id, &[])
         .unwrap();