---

graydon · graydon · commit f295d788ca7f · 2011-05-04T06:19:58.000Z
yaml --- r: 2341 b: refs/heads/master c: 99f1dff h: refs/heads/master i: 2339: f9e5ace v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc181bca4e964c42adb246ac1891c781fa6d585c
+refs/heads/master: 99f1dffd490b4a3c76356240eb35fae901f8151b
diff --git a/trunk/src/rt/rust_upcall.cpp b/trunk/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();
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: dc181bca4e964c42adb246ac1891c781fa6d585c`
	`2`	`+refs/heads/master: 99f1dffd490b4a3c76356240eb35fae901f8151b`