---

brson · brson · commit d18503ad51a6 · 2011-07-14T18:49:18.000-07:00
yaml --- r: 3936 b: refs/heads/master c: c99e110 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01a52d728c5058769e6c0939c57579821f238056
+refs/heads/master: c99e110119daa3e5cff1a54424c87e3fa4c9b4c5
diff --git a/trunk/src/rt/rust_upcall.cpp b/trunk/src/rt/rust_upcall.cpp
@@ -221,6 +221,9 @@ upcall_fail(rust_task *task,
     LOG_UPCALL_ENTRY(task);
     LOG_ERR(task, upcall, "upcall fail '%s', %s:%" PRIdPTR, expr, file, line);
     task->fail();
+    task->die();
+    task->notify_tasks_waiting_to_join();
+    task->yield(4);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 01a52d728c5058769e6c0939c57579821f238056`
	`2`	`+refs/heads/master: c99e110119daa3e5cff1a54424c87e3fa4c9b4c5`
Original file line number	Diff line number	Diff line change
`@@ -221,6 +221,9 @@ upcall_fail(rust_task *task,`
`221`	`221`	`LOG_UPCALL_ENTRY(task);`
`222`	`222`	`LOG_ERR(task, upcall, "upcall fail '%s', %s:%" PRIdPTR, expr, file, line);`
`223`	`223`	`task->fail();`
	`224`	`+ task->die();`
	`225`	`+ task->notify_tasks_waiting_to_join();`
	`226`	`+ task->yield(4);`
`224`	`227`	`}`
`225`	`228`
`226`	`229`	`/**`