From 26be83b564208d61a06106ea9769b711ad275b85 Mon Sep 17 00:00:00 2001 From: Ryan Levick Date: Tue, 12 Jan 2021 17:54:59 +0100 Subject: [PATCH] Revert "Rollup merge of #79968 - bjorn3:better_drop_glue_debuginfo, r=matthewjasper" This reverts commit f90c7f0f42dbebbb85d9699b5826b0b103b0fbde, reversing changes made to 5c0f5b69c2b11a16f34ff25da69be831336f3596. --- compiler/rustc_symbol_mangling/src/legacy.rs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/compiler/rustc_symbol_mangling/src/legacy.rs b/compiler/rustc_symbol_mangling/src/legacy.rs index b0d5f34090241..6356a7e783255 100644 --- a/compiler/rustc_symbol_mangling/src/legacy.rs +++ b/compiler/rustc_symbol_mangling/src/legacy.rs @@ -56,15 +56,7 @@ pub(super) fn mangle( let hash = get_symbol_hash(tcx, instance, instance_ty, instantiating_crate); let mut printer = SymbolPrinter { tcx, path: SymbolPath::new(), keep_within_component: false } - .print_def_path( - def_id, - if let ty::InstanceDef::DropGlue(_, _) = instance.def { - // Add the name of the dropped type to the symbol name - &*instance.substs - } else { - &[] - }, - ) + .print_def_path(def_id, &[]) .unwrap(); if let ty::InstanceDef::VtableShim(..) = instance.def {