---

yaml
---
r: 5055
b: refs/heads/master
c: 0abec86
h: refs/heads/master
i:
  5053: 2b5e2ad
  5051: 5aa0a6a
  5047: fe89400
  5039: 59b12c2
  5023: 62eb3f1
  4991: 6bd25f7
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c936d7992123e029dedea0380f429b6844a9ab8
+refs/heads/master: 0abec867c346a73e72410cbe9360eb16c2fbdd22

trunk/src/comp/middle/trans.rs

@@ -4409,12 +4409,22 @@ fn trans_fail_expr(cx: &@block_ctxt, sp_opt: &option::t<span>,
         let e_ty = ty::expr_ty(tcx, expr);
         bcx = expr_res.bcx;
 
-
         if ty::type_is_str(tcx, e_ty) {
-            let elt =
-                GEP(bcx, expr_res.val,
-                              [C_int(0), C_int(abi::vec_elt_data)]);
-            ret trans_fail_value(bcx, sp_opt, elt);
+            let is_istr = alt ty::struct(tcx, e_ty) {
+              ty::ty_istr. { true }
+              _ { false }
+            };
+            if !is_istr {
+                let elt =
+                    GEP(bcx, expr_res.val,
+                        [C_int(0), C_int(abi::vec_elt_data)]);
+                ret trans_fail_value(bcx, sp_opt, elt);
+            } else {
+                let data = ivec::get_dataptr(
+                    bcx, expr_res.val,
+                    type_of_or_i8(bcx, ty::mk_mach(tcx, ast::ty_u8)));
+                ret trans_fail_value(bcx, sp_opt, data);
+            }
         } else {
             bcx_ccx(cx).sess.span_bug(expr.span,
                                       ~"fail called with unsupported type "

trunk/src/comp/middle/typeck.rs

@@ -1860,7 +1860,15 @@ fn check_expr_with_unifier(fcx: &@fn_ctxt, expr: &@ast::expr, unify: &unifier,
         bot = true;
         alt expr_opt {
           none. {/* do nothing */ }
-          some(e) { check_expr_with(fcx, e, ty::mk_str(tcx)); }
+          some(e) {
+            // FIXME: istr transitional. Should be:
+            // check_expr_with(fcx, e, ty::mk_str(tcx));
+            check_expr(fcx, e);
+            if !are_compatible(fcx, expr_ty(tcx, e), ty::mk_str(tcx))
+                && !are_compatible(fcx, expr_ty(tcx, e), ty::mk_istr(tcx)) {
+                check_expr_with(fcx, e, ty::mk_str(tcx));
+            }
+          }
         }
         write::bot_ty(tcx, id);
       }

trunk/src/test/run-fail/explicit-fail-msg.rs

@@ -1,3 +1,3 @@
 // error-pattern:wooooo
 // no-valgrind
-fn main() { let a = 1; if 1 == 1 { a = 2; } fail "woooo" + "o"; }
+fn main() { let a = 1; if 1 == 1 { a = 2; } fail ~"woooo" + ~"o"; }