---

yaml
---
r: 29955
b: refs/heads/incoming
c: 47cca22
h: refs/heads/master
i:
  29953: 303a219
  29951: f50bb74
v: v3

Author: bblum

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 0229bc4defdaa6bad77269204279ed1a37b3aa9f
+refs/heads/incoming: 47cca22d5455d2d60226ead907fd627784701ef5
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/task.rs

@@ -1473,9 +1473,13 @@ extern mod rustrt {
 
     fn rust_task_is_unwinding(task: *rust_task) -> bool;
     fn rust_osmain_sched_id() -> sched_id;
+    #[rust_stack]
     fn rust_task_inhibit_kill(t: *rust_task);
+    #[rust_stack]
     fn rust_task_allow_kill(t: *rust_task);
+    #[rust_stack]
     fn rust_task_inhibit_yield(t: *rust_task);
+    #[rust_stack]
     fn rust_task_allow_yield(t: *rust_task);
     fn rust_task_kill_other(task: *rust_task);
     fn rust_task_kill_all(task: *rust_task);

branches/incoming/src/rt/rust_task.cpp

@@ -631,27 +631,29 @@ rust_task::on_rust_stack() {
     }
 }
 
+// NB: In inhibit_kill and allow_kill, helgrind would complain that we need to
+// hold lifecycle_lock while accessing disallow_kill. Even though another
+// killing task may access disallow_kill concurrently, this is not racy
+// because the killer only cares if this task is blocking, and block() already
+// uses proper locking. See https://github.com/mozilla/rust/issues/3213 .
+
 void
 rust_task::inhibit_kill() {
-    scoped_lock with(lifecycle_lock);
     // Here might be good, though not mandatory, to check if we have to die.
     disallow_kill++;
 }
 
 void
 rust_task::allow_kill() {
-    scoped_lock with(lifecycle_lock);
     assert(disallow_kill > 0 && "Illegal allow_kill(): already killable!");
     disallow_kill--;
 }
 
 void rust_task::inhibit_yield() {
-    scoped_lock with(lifecycle_lock);
     disallow_yield++;
 }
 
 void rust_task::allow_yield() {
-    scoped_lock with(lifecycle_lock);
     assert(disallow_yield > 0 && "Illegal allow_yield(): already yieldable!");
     disallow_yield--;
 }