---

yaml
---
r: 21786
b: refs/heads/snap-stage3
c: 8fbe4b5
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 86e02554fd3e3795626cba4d50de6243c19ff972
+refs/heads/snap-stage3: 8fbe4b58412b2818d4ef3d92259bdf5f88f61606
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/rt.rs

@@ -39,6 +39,12 @@ fn rt_fail(expr: *c_char, file: *c_char, line: size_t) {
     rustrt::rust_upcall_fail(expr, file, line);
 }
 
+#[rt(fail_)]
+fn rt_fail_(expr: *c_char, file: *c_char, line: size_t) {
+    cleanup_stack_for_failure();
+    rustrt::rust_upcall_fail(expr, file, line);
+}
+
 #[rt(exchange_malloc)]
 fn rt_exchange_malloc(td: *c_char, size: uintptr_t) -> *c_char {
     return rustrt::rust_upcall_exchange_malloc(td, size);

branches/snap-stage3/src/rustc/middle/trans/base.rs

@@ -2403,7 +2403,7 @@ fn gather_rtcalls(ccx: @crate_ctxt, crate: @ast::crate) {
     // in some obscure place in LLVM if the user provides the wrong signature
     // for an rtcall.
     let expected_rtcalls =
-        ~[~"exchange_free", ~"exchange_malloc", ~"fail", ~"free", ~"malloc"];
+        ~[~"exchange_free", ~"exchange_malloc", ~"fail_", ~"free", ~"malloc"];
     for vec::each(expected_rtcalls) |name| {
         if !ccx.rtcalls.contains_key(name) {
             fail fmt!("no definition for runtime call %s", name);