---

yaml
---
r: 11639
b: refs/heads/master
c: 0432030
h: refs/heads/master
i:
  11637: 91d0d2c
  11635: 72a7268
  11631: f3cf088
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 43f9f4d54ab7a0b61bce06e017c715e2f4cc85de
+refs/heads/master: 0432030c2727183f3cbda0263de2ca2b90c37353
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rt/rust_task.cpp

@@ -421,8 +421,6 @@ rust_task::transition(rust_task_list *src, rust_task_list *dst) {
 
 void
 rust_task::block(rust_cond *on, const char* name) {
-    I(thread, !lock.lock_held_by_current_thread());
-    scoped_lock with(lock);
     LOG(this, task, "Blocking on 0x%" PRIxPTR ", cond: 0x%" PRIxPTR,
                          (uintptr_t) on, (uintptr_t) cond);
     A(thread, cond == NULL, "Cannot block an already blocked task.");
@@ -435,8 +433,6 @@ rust_task::block(rust_cond *on, const char* name) {
 
 void
 rust_task::wakeup(rust_cond *from) {
-    I(thread, !lock.lock_held_by_current_thread());
-    scoped_lock with(lock);
     A(thread, cond != NULL, "Cannot wake up unblocked task.");
     LOG(this, task, "Blocked on 0x%" PRIxPTR " woken up on 0x%" PRIxPTR,
                         (uintptr_t) cond, (uintptr_t) from);
@@ -449,8 +445,6 @@ rust_task::wakeup(rust_cond *from) {
 
 void
 rust_task::die() {
-    I(thread, !lock.lock_held_by_current_thread());
-    scoped_lock with(lock);
     transition(&thread->running_tasks, &thread->dead_tasks);
 }