From 99f1dffd490b4a3c76356240eb35fae901f8151b Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Wed, 4 May 2011 06:19:58 +0000
Subject: Fail in a slightly more organized fashion for now.

---
 src/rt/rust_upcall.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/rt')

diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp
index 5cfd3847..d64c740c 100644
--- a/src/rt/rust_upcall.cpp
+++ b/src/rt/rust_upcall.cpp
@@ -275,10 +275,8 @@ upcall_fail(rust_task *task,
     LOG_UPCALL_ENTRY(task);
     LOG_ERR(task, upcall, "upcall fail '%s', %s:%" PRIdPTR, expr, file, line);
     task->fail(4);
-    if (getenv("RUST_TRAP_FAILURE")) {
-        // FIXME: x86-ism.
-        __asm__("int3");
-    }
+    // FIXME: re-implement unwinding.
+    abort();
 }
 
 /**
-- 
cgit v1.2.3