about summary refs log tree commit diff
path: root/src/rt/rust_upcall.cpp
diff options
context:
space:
mode:
authorGraydon Hoare <graydon@mozilla.com>2011-05-04 06:19:58 +0000
committerGraydon Hoare <graydon@mozilla.com>2011-05-04 06:19:58 +0000
commit99f1dffd490b4a3c76356240eb35fae901f8151b (patch)
tree04a3e4dc0650c4f9287eb6db1e2e2be5c836a333 /src/rt/rust_upcall.cpp
parentdc181bca4e964c42adb246ac1891c781fa6d585c (diff)
downloadrust-99f1dffd490b4a3c76356240eb35fae901f8151b.tar.gz
rust-99f1dffd490b4a3c76356240eb35fae901f8151b.zip
Fail in a slightly more organized fashion for now.
Diffstat (limited to 'src/rt/rust_upcall.cpp')
-rw-r--r--src/rt/rust_upcall.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp
index 5cfd384791e..d64c740c162 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();
 }
 
 /**