aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraydon Hoare <[email protected]>2011-05-04 15:04:53 +0000
committerGraydon Hoare <[email protected]>2011-05-04 15:04:53 +0000
commit895ec07453a8fbbd8d9ecae479db4285c0b21355 (patch)
tree1a18f645a440ed84d44a2cc4b888b3915c65d09e
parentFail in a slightly more organized fashion for now. (diff)
downloadrust-895ec07453a8fbbd8d9ecae479db4285c0b21355.tar.xz
rust-895ec07453a8fbbd8d9ecae479db4285c0b21355.zip
Try to fail nicely, again.
-rw-r--r--src/rt/rust_task.cpp2
-rw-r--r--src/rt/rust_upcall.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp
index 7080d6f3..3f4c89d8 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 d64c740c..11dddce7 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();
}
/**