Correctly generate drop glue for Box<str>

bkoropoff · bkoropoff · commit 1f7a8bcb4b80 · 2014-10-03T23:00:20.000-07:00
This fixes an ICE. Closes issue #17734
diff --git 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(..) => {

Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,7 @@ fn make_drop_glue<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, v0: ValueRef, t: ty::t)`
`429`	`429`	`tvec::make_drop_glue_unboxed(bcx, v0, ty, true)`
`430`	`430`	`}`
`431`	`431`	`ty::ty_str => {`
`432`		`- let unit_ty = ty::sequence_element_type(bcx.tcx(), t);`
	`432`	`+ let unit_ty = ty::sequence_element_type(bcx.tcx(), content_ty);`
`433`	`433`	`tvec::make_drop_glue_unboxed(bcx, v0, unit_ty, true)`
`434`	`434`	`}`
`435`	`435`	`ty::ty_trait(..) => {`