From 895ec07453a8fbbd8d9ecae479db4285c0b21355 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Wed, 4 May 2011 15:04:53 +0000
Subject: [PATCH] Try to fail nicely, again.

---
 src/rt/rust_task.cpp   | 2 ++
 src/rt/rust_upcall.cpp | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp
index 7080d6f386d..3f4c89d8948 100644
--- a/src/rt/rust_task.cpp
+++ b/src/rt/rust_task.cpp
@@ -505,6 +505,8 @@ rust_task::fail(size_t nargs) {
              name, this, supervisor->name, supervisor);
         supervisor->kill();
     }
+    // FIXME: implement unwinding again.
+    exit(1);
 }
 
 void
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp
index d64c740c162..11dddce7346 100644
--- a/src/rt/rust_upcall.cpp
+++ b/src/rt/rust_upcall.cpp
@@ -275,8 +275,6 @@ upcall_fail(rust_task *task,
     LOG_UPCALL_ENTRY(task);
     LOG_ERR(task, upcall, "upcall fail '%s', %s:%" PRIdPTR, expr, file, line);
     task->fail(4);
-    // FIXME: re-implement unwinding.
-    abort();
 }
 
 /**