---

yaml
---
r: 64304
b: refs/heads/snap-stage3
c: 21d7098
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 6148c1c0c5d6a1fcef0486ab8f22656187c85376
+refs/heads/snap-stage3: 21d709842704c6d6ba33a12b236b4d680e591004
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/back/link.rs

@@ -200,6 +200,8 @@ pub mod jit {
         }
     }
 
+    // The stage1 compiler won't work, but that doesn't really matter. TLS
+    // changed only very recently to allow storage of owned values.
     fn engine_key(_: ~Engine) {}
 
     #[cfg(not(stage0))]
@@ -213,6 +215,8 @@ pub mod jit {
     pub fn consume_engine() -> Option<~Engine> {
         unsafe { local_data::pop(engine_key) }
     }
+    #[cfg(stage0)]
+    pub fn consume_engine() -> Option<~Engine> { None }
 }
 
 pub mod write {

branches/snap-stage3/src/librustc/rustc.rs

@@ -332,7 +332,11 @@ pub fn monitor(f: ~fn(diagnostic::Emitter)) {
 
         let _finally = finally { ch: ch };
 
-        f(demitter)
+        f(demitter);
+
+        // Due reasons explain in #7732, if there was a jit execution context it
+        // must be consumed and passed along to our parent task.
+        back::link::jit::consume_engine()
     } {
         result::Ok(_) => { /* fallthrough */ }
         result::Err(_) => {