---

yaml
---
r: 139831
b: refs/heads/try2
c: 4f1dd1f
h: refs/heads/master
i:
  139829: 0925306
  139827: cd57c67
  139823: 5793a56
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 93757d81853302408dd30a3ad1a4102eae26b7c5
+refs/heads/try2: 4f1dd1fd212f51f0a2f4fe20f9ebc7e0dc9081d8
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libcore/rt/sched.rs

@@ -203,7 +203,10 @@ pub impl Scheduler {
             Context::swap(last_task_context, sched_context);
         }
 
-        self.run_cleanup_job();
+        // We could be executing in a different thread now
+        do local::borrow |sched| {
+            sched.run_cleanup_job();
+        }
     }
 
     /// Switch directly to another task, without going through the scheduler.
@@ -224,7 +227,10 @@ pub impl Scheduler {
             Context::swap(last_task_context, next_task_context);
         }
 
-        self.run_cleanup_job();
+        // We could be executing in a different thread now
+        do local::borrow |sched| {
+            sched.run_cleanup_job();
+        }
     }
 
     // * Other stuff