---

yaml
---
r: 30061
b: refs/heads/incoming
c: 5ba7434
h: refs/heads/master
i:
  30059: d808ea9
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: e55c5ceac239417784f9fe8c37f92e974b9cc06e
+refs/heads/incoming: 5ba7434cb17c19438b00730b37741f2d61449ad8
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rt/rust_task.cpp

@@ -248,6 +248,13 @@ MUST_CHECK bool rust_task::yield() {
 
     // This check is largely superfluous; it's the one after the context swap
     // that really matters. This one allows us to assert a useful invariant.
+
+    // NB: This takes lifecycle_lock three times, and I believe that none of
+    // them are actually necessary, as per #3213. Removing the locks here may
+    // cause *harmless* races with a killer... but I didn't observe any
+    // substantial performance improvement from removing them, even with
+    // msgsend-ring-pipes, and also it's my last day, so I'm not about to
+    // remove them.  -- bblum
     if (must_fail_from_being_killed()) {
         {
             scoped_lock with(lifecycle_lock);

branches/incoming/src/rt/rust_task.h

@@ -431,12 +431,11 @@ rust_task::call_on_rust_stack(void *args, void *fn_ptr) {
     assert(get_sp_limit() != 0 && "Stack must be configured");
     assert(next_rust_sp);
 
-    bool had_reentered_rust_stack;
-    {
-        scoped_lock with(lifecycle_lock);
-        had_reentered_rust_stack = reentered_rust_stack;
-        reentered_rust_stack = true;
-    }
+    // Unlocked access. Might "race" a killer, but harmlessly. This code is
+    // only run by the task itself, so cannot race itself. See the comment
+    // above inhibit_kill (or #3213) in rust_task.cpp for justification.
+    bool had_reentered_rust_stack = reentered_rust_stack;
+    reentered_rust_stack = true;
 
     uintptr_t prev_c_sp = next_c_sp;
     next_c_sp = get_sp();
@@ -448,10 +447,7 @@ rust_task::call_on_rust_stack(void *args, void *fn_ptr) {
     __morestack(args, fn_ptr, sp);
 
     next_c_sp = prev_c_sp;
-    {
-        scoped_lock with(lifecycle_lock);
-        reentered_rust_stack = had_reentered_rust_stack;
-    }
+    reentered_rust_stack = had_reentered_rust_stack;
 
     record_sp_limit(0);
 }