---

yaml
---
r: 30499
b: refs/heads/incoming
c: fa74edf
h: refs/heads/master
i:
  30497: fc45487
  30495: ab210b5
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 719a4750ba7d4c6e35f6a2d0579ab9fb79dbf1f3
+refs/heads/incoming: fa74edf1a00c12c9e37ccf9a43c68b0f1a453678
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustc/middle/trans/controlflow.rs

@@ -340,7 +340,7 @@ fn trans_fail_value(bcx: block, sp_opt: Option<span>, V_fail_str: ValueRef)
     let V_str = PointerCast(bcx, V_fail_str, T_ptr(T_i8()));
     let V_filename = PointerCast(bcx, V_filename, T_ptr(T_i8()));
     let args = ~[V_str, V_filename, C_int(ccx, V_line)];
-    let bcx = callee::trans_rtcall(bcx, ~"fail", args, expr::Ignore);
+    let bcx = callee::trans_rtcall(bcx, ~"fail_", args, expr::Ignore);
     Unreachable(bcx);
     return bcx;
 }