about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Koropoff <bkoropoff@gmail.com>2014-10-03 23:00:20 -0700
committerBrian Koropoff <bkoropoff@gmail.com>2014-10-03 23:00:20 -0700
commit1f7a8bcb4b804c9198c2b7315368c9bf8226dfb5 (patch)
tree0fe03c3ef7b460362d086121f25feb5d4377cd3b
parent908c9e6a1b94674eee2727edb25dda58727a03b7 (diff)
downloadrust-1f7a8bcb4b804c9198c2b7315368c9bf8226dfb5.tar.gz
rust-1f7a8bcb4b804c9198c2b7315368c9bf8226dfb5.zip
Correctly generate drop glue for `Box<str>`
This fixes an ICE.  Closes issue #17734
-rw-r--r--src/librustc/middle/trans/glue.rs2
1 files changed, 1 insertions, 1 deletions
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(..) => {