---

yaml
---
r: 2763
b: refs/heads/master
c: b129258
h: refs/heads/master
i:
  2761: ccc898d
  2759: acfd49c
v: v3

Author: cixtor

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fc91b6ecc975bf508ec631a9fe3ea19e8df4579
+refs/heads/master: b1292580b95ea4a2ab22682ff04a91004c44cd06

trunk/src/comp/middle/trans.rs

@@ -7672,9 +7672,9 @@ fn create_crate_constant(ValueRef crate_ptr, @glue_fns glues) {
                      C_null(T_int()),     // size_t debug_info_sz
                      C_null(T_int()),     // size_t pad
                      yield_glue_off,      // size_t yield_glue_off
-                     C_null(T_int()),     // size_t unwind_glue_off
-                     C_null(T_int()),     // size_t gc_glue_off
                      C_null(T_int()),     // size_t pad
+                     C_null(T_int()),     // size_t gc_glue_off
+                     C_null(T_int()),     // size_t pad2
                      C_null(T_int()),     // int n_rust_syms
                      C_null(T_int()),     // int n_c_syms
                      C_null(T_int())      // int n_libs

trunk/src/rt/rust_crate.cpp

@@ -11,11 +11,6 @@ rust_crate::get_relocation_diff() const {
   return ((uintptr_t)this - self_addr);
 }
 
-uintptr_t
-rust_crate::get_unwind_glue() const {
-  return ((uintptr_t)this + unwind_glue_off);
-}
-
 uintptr_t
 rust_crate::get_gc_glue() const {
   return ((uintptr_t)this + gc_glue_off);

trunk/src/rt/rust_internal.h

@@ -233,9 +233,9 @@ class rust_crate {
 
     ptrdiff_t activate_glue_off;
     ptrdiff_t yield_glue_off;
-    ptrdiff_t unwind_glue_off;
-    ptrdiff_t gc_glue_off;
     ptrdiff_t pad;
+    ptrdiff_t gc_glue_off;
+    ptrdiff_t pad2;
 
 public:
 
@@ -248,7 +248,6 @@ class rust_crate {
     uintptr_t get_image_base() const;
     ptrdiff_t get_relocation_diff() const;
     uintptr_t get_yield_glue() const;
-    uintptr_t get_unwind_glue() const;
     uintptr_t get_gc_glue() const;
 
     struct mem_area

trunk/src/rt/rust_task.cpp

@@ -349,7 +349,7 @@ rust_task::kill() {
         dom->fail();
 
     LOG(this, task, "preparing to unwind task: 0x%" PRIxPTR, this);
-    run_on_resume(dom->root_crate->get_unwind_glue());
+    // run_on_resume(rust_unwind_glue);
 }
 
 void
@@ -361,7 +361,7 @@ rust_task::fail(size_t nargs) {
     unblock();
     if (this == dom->root_task)
         dom->fail();
-    run_after_return(nargs, dom->root_crate->get_unwind_glue());
+    // run_after_return(nargs, rust_unwind_glue);
     if (supervisor) {
         DLOG(dom, task,
              "task %s @0x%" PRIxPTR