---

yaml
---
r: 15812
b: refs/heads/try
c: 5d625af
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: c424b7f847bbec50d01b00a89e044d80b8eb59f8
+refs/heads/try: 5d625af9f944c7b6567c443a6f796e30dbb01bf2
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_task.cpp

@@ -248,7 +248,7 @@ rust_task::kill() {
     killed = true;
     // Unblock the task so it can unwind.
 
-    if (blocked()) {
+    if (blocked() && must_fail_from_being_killed_unlocked()) {
         wakeup(cond);
     }
 
@@ -648,11 +648,13 @@ rust_task::on_rust_stack() {
 
 void
 rust_task::inhibit_kill() {
+    scoped_lock with(kill_lock);
     disallow_kill = true;
 }
 
 void
 rust_task::allow_kill() {
+    scoped_lock with(kill_lock);
     disallow_kill = false;
 }
 

branches/try/src/rt/rust_task.h

@@ -149,7 +149,7 @@ rust_task : public kernel_owned<rust_task>, rust_cond
     rust_cond *cond;
     const char *cond_name;
 
-    // Protects the killed flag
+    // Protects the killed flag, disallow_kill flag, reentered_rust_stack
     lock_and_signal kill_lock;
     // Indicates that the task was killed and needs to unwind
     bool killed;
@@ -372,7 +372,10 @@ rust_task::call_on_rust_stack(void *args, void *fn_ptr) {
     assert(next_rust_sp);
 
     bool had_reentered_rust_stack = reentered_rust_stack;
-    reentered_rust_stack = true;
+    {
+        scoped_lock with(kill_lock);
+        reentered_rust_stack = true;
+    }
 
     uintptr_t prev_c_sp = next_c_sp;
     next_c_sp = get_sp();
@@ -384,7 +387,10 @@ rust_task::call_on_rust_stack(void *args, void *fn_ptr) {
     __morestack(args, fn_ptr, sp);
 
     next_c_sp = prev_c_sp;
-    reentered_rust_stack = had_reentered_rust_stack;
+    {
+        scoped_lock with(kill_lock);
+        reentered_rust_stack = had_reentered_rust_stack;
+    }
 }
 
 inline void