aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraydon Hoare <[email protected]>2011-05-04 06:19:58 +0000
committerGraydon Hoare <[email protected]>2011-05-04 06:19:58 +0000
commit99f1dffd490b4a3c76356240eb35fae901f8151b (patch)
tree04a3e4dc0650c4f9287eb6db1e2e2be5c836a333
parentrustc: Stub Rust intrinsics. We check in the .ll file for now to temporarily ... (diff)
downloadrust-99f1dffd490b4a3c76356240eb35fae901f8151b.tar.xz
rust-99f1dffd490b4a3c76356240eb35fae901f8151b.zip
Fail in a slightly more organized fashion for now.
-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 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();
}
/**