about summary refs log tree commit diff
path: root/src/rt/rust_task.h
diff options
context:
space:
mode:
authorBen Blum <bblum@andrew.cmu.edu>2012-07-31 22:29:59 -0400
committerBen Blum <bblum@andrew.cmu.edu>2012-08-01 23:08:06 -0400
commit7cb3f3e86a5500ecf40500dc9f6cedabd8e0349e (patch)
tree4848685fe1e9351f6440dc6788b5cdd416fbb194 /src/rt/rust_task.h
parent43b81147508c5927d93ff0a7ff28869becf405bd (diff)
downloadrust-7cb3f3e86a5500ecf40500dc9f6cedabd8e0349e.tar.gz
rust-7cb3f3e86a5500ecf40500dc9f6cedabd8e0349e.zip
Linked failure: enable unidirectional propagate test; replace FIXMEs with comments (tag #1868).
Diffstat (limited to 'src/rt/rust_task.h')
-rw-r--r--src/rt/rust_task.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rt/rust_task.h b/src/rt/rust_task.h
index 10419686d48..369d84dd065 100644
--- a/src/rt/rust_task.h
+++ b/src/rt/rust_task.h
@@ -431,10 +431,10 @@ 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 = reentered_rust_stack;
+    bool had_reentered_rust_stack;
     {
-        // FIXME (#1868) This must be racy. Figure it out.
         scoped_lock with(lifecycle_lock);
+        had_reentered_rust_stack = reentered_rust_stack;
         reentered_rust_stack = true;
     }