---

yaml
---
r: 13136
b: refs/heads/master
c: 54d42c4
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a4ba088ef839de00cf97a905083be19c212c8a9c
+refs/heads/master: 54d42c4d74bb88d7e411d5c9abf8a402fedf0049
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/trans/base.rs

@@ -3890,9 +3890,11 @@ fn trans_fail_expr(bcx: block, sp_opt: option<span>,
         bcx = expr_res.bcx;
 
         if ty::type_is_str(e_ty) {
-            let data = tvec::get_dataptr(
-                bcx, expr_res.val, type_of(
-                    ccx, ty::mk_mach_uint(tcx, ast::ty_u8)));
+            let unit_ty = ty::mk_mach_uint(tcx, ast::ty_u8);
+            let vec_ty = ty::mk_vec(tcx, {ty: unit_ty, mutbl: ast::m_imm});
+            let unit_llty = type_of(ccx, unit_ty);
+            let body = tvec::get_bodyptr(bcx, expr_res.val, vec_ty);
+            let data = tvec::get_dataptr(bcx, body, unit_llty);
             ret trans_fail_value(bcx, sp_opt, data);
         } else if bcx.unreachable || ty::type_is_bot(e_ty) {
             ret bcx;