From: Brian Koropoff Date: Sat, 4 Oct 2014 06:00:20 +0000 (-0700) Subject: Correctly generate drop glue for `Box` X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=1f7a8bcb4b804c9198c2b7315368c9bf8226dfb5;p=rust.git Correctly generate drop glue for `Box` This fixes an ICE. Closes issue #17734 --- diff --git a/src/librustc/middle/trans/glue.rs b/src/librustc/middle/trans/glue.rs index 33a46c0ba36..87bd451939e 100644 --- a/src/librustc/middle/trans/glue.rs +++ b/src/librustc/middle/trans/glue.rs @@ -429,7 +429,7 @@ fn make_drop_glue<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, v0: ValueRef, t: ty::t) tvec::make_drop_glue_unboxed(bcx, v0, ty, true) } ty::ty_str => { - let unit_ty = ty::sequence_element_type(bcx.tcx(), t); + let unit_ty = ty::sequence_element_type(bcx.tcx(), content_ty); tvec::make_drop_glue_unboxed(bcx, v0, unit_ty, true) } ty::ty_trait(..) => {