---

yaml
---
r: 23756
b: refs/heads/master
c: d155410
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 2d116cbbed3180d06446407b9cb63811853011ad
+refs/heads/master: d1554106742fa8c0a99cac1adc5f65aa0ce0ac62
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rt/rust_task.cpp

@@ -23,8 +23,8 @@ rust_task::rust_task(rust_sched_loop *sched_loop, rust_task_state state,
     name(name),
     list_index(-1),
     rendezvous_ptr(0),
-    local_region(&sched_loop->local_region),
     boxed(sched_loop->kernel->env, &local_region),
+    local_region(&sched_loop->local_region),
     unwinding(false),
     cc_counter(0),
     total_stack_sz(0),

trunk/src/rt/rust_task.h

@@ -214,8 +214,8 @@ rust_task : public kernel_owned<rust_task>
     // that location before waking us up.
     uintptr_t* rendezvous_ptr;
 
-    memory_region local_region;
     boxed_region boxed;
+    memory_region local_region;
 
     // Indicates that fail() has been called and we are cleaning up.
     // We use this to suppress the "killed" flag during calls to yield.