]> git.lizzy.rs Git - rust.git/commitdiff
Correctly generate drop glue for `Box<str>`
authorBrian Koropoff <bkoropoff@gmail.com>
Sat, 4 Oct 2014 06:00:20 +0000 (23:00 -0700)
committerBrian Koropoff <bkoropoff@gmail.com>
Sat, 4 Oct 2014 06:00:20 +0000 (23:00 -0700)
This fixes an ICE.  Closes issue #17734

src/librustc/middle/trans/glue.rs

index 33a46c0ba36af729bf352683754d9034b7c53158..87bd451939eabc57d25bf58334b00f7c93ed8709 100644 (file)
@@ -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(..) => {