---

graydon · graydon · commit 6d82b6cb61fd · 2011-05-04T15:04:53.000Z
yaml --- r: 2342 b: refs/heads/master c: 895ec07 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99f1dffd490b4a3c76356240eb35fae901f8151b
+refs/heads/master: 895ec07453a8fbbd8d9ecae479db4285c0b21355
diff --git a/trunk/src/rt/rust_task.cpp b/trunk/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/trunk/src/rt/rust_upcall.cpp b/trunk/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();
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 99f1dffd490b4a3c76356240eb35fae901f8151b`
	`2`	`+refs/heads/master: 895ec07453a8fbbd8d9ecae479db4285c0b21355`
Original file line number	Diff line number	Diff line change
`@@ -505,6 +505,8 @@ rust_task::fail(size_t nargs) {`
`505`	`505`	`name, this, supervisor->name, supervisor);`
`506`	`506`	`supervisor->kill();`
`507`	`507`	`}`
	`508`	`+ // FIXME: implement unwinding again.`
	`509`	`+ exit(1);`
`508`	`510`	`}`
`509`	`511`
`510`	`512`	`void`
Original file line number	Diff line number	Diff line change
`@@ -275,8 +275,6 @@ upcall_fail(rust_task *task,`
`275`	`275`	`LOG_UPCALL_ENTRY(task);`
`276`	`276`	`LOG_ERR(task, upcall, "upcall fail '%s', %s:%" PRIdPTR, expr, file, line);`
`277`	`277`	`task->fail(4);`
`278`		`- // FIXME: re-implement unwinding.`
`279`		`- abort();`
`280`	`278`	`}`
`281`	`279`
`282`	`280`	`/**`