Skip to content

Commit

Permalink
Revert "Rollup merge of rust-lang#79968 - bjorn3:better_drop_glue_deb…
Browse files Browse the repository at this point in the history
…uginfo, r=matthewjasper"

This reverts commit f90c7f0, reversing
changes made to 5c0f5b6.
  • Loading branch information
rylev committed Jan 12, 2021
1 parent fc9944f commit 26be83b
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions compiler/rustc_symbol_mangling/src/legacy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 26be83b

Please sign in to comment.