---

yaml
---
r: 22733
b: refs/heads/master
c: 8d43724
h: refs/heads/master
i:
  22731: 0f1d0b4
v: v3

Author: bblum

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c68f2d9aab7e573824d7055a6c6f4783a53dc3f8
+refs/heads/master: 8d43724087b20a6167fe1a178f965012d75efc7e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rt/rust_task.cpp

@@ -574,15 +574,6 @@ sp_in_stk_seg(uintptr_t sp, stk_seg *stk) {
     return (uintptr_t)stk->data <= sp && sp <= stk->end;
 }
 
-struct reset_args {
-    rust_task *task;
-    uintptr_t sp;
-};
-
-void
-reset_stack_limit_on_c_stack(reset_args *args) {
-}
-
 /*
 Called by landing pads during unwinding to figure out which stack segment we
 are currently running on and record the stack limit (which was not restored

trunk/src/rt/rust_task.h

@@ -433,7 +433,7 @@ rust_task::call_on_rust_stack(void *args, void *fn_ptr) {
 
     bool had_reentered_rust_stack = reentered_rust_stack;
     {
-        // FIXME (#2875) This must be racy. Figure it out.
+        // FIXME (#1868) This must be racy. Figure it out.
         scoped_lock with(lifecycle_lock);
         reentered_rust_stack = true;
     }