---

yaml
---
r: 14648
b: refs/heads/try
c: fa566ad
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 2465a63a69ea51d4fce10430b6a8fd0079cbbcd5
+refs/heads/try: fa566ad2fdf4b2bb63af87b2aa6fda3d5d48ce6d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_task.cpp

@@ -107,8 +107,6 @@ rust_task::rust_task(rust_task_thread *thread, rust_task_list *state,
 void
 rust_task::delete_this()
 {
-    I(thread, !thread->lock.lock_held_by_current_thread());
-
     {
         scoped_lock with (lock);
         I(thread, port_table.is_empty());

branches/try/src/rt/rust_task_thread.h

@@ -47,6 +47,8 @@ struct rust_task_thread : public kernel_owned<rust_task_thread>,
 {
 private:
 
+    lock_and_signal lock;
+
     // Fields known only by the runtime:
     rust_log _log;
 
@@ -76,8 +78,6 @@ struct rust_task_thread : public kernel_owned<rust_task_thread>,
     rust_scheduler *sched;
     rust_srv *srv;
 
-    lock_and_signal lock;
-
     rust_task_list newborn_tasks;
     rust_task_list running_tasks;
     rust_task_list blocked_tasks;