diff options
| author | Rafael Ávila de Espíndola <respindola@mozilla.com> | 2011-05-24 17:28:37 -0400 |
|---|---|---|
| committer | Rafael Ávila de Espíndola <respindola@mozilla.com> | 2011-05-24 17:28:37 -0400 |
| commit | b1292580b95ea4a2ab22682ff04a91004c44cd06 (patch) | |
| tree | b2401d3316a815ee79108ed2745d247dad5beecd /src | |
| parent | 0fc91b6ecc975bf508ec631a9fe3ea19e8df4579 (diff) | |
| download | rust-b1292580b95ea4a2ab22682ff04a91004c44cd06.tar.gz rust-b1292580b95ea4a2ab22682ff04a91004c44cd06.zip | |
Remove dead code for unwind_glue.
Diffstat (limited to 'src')
| -rw-r--r-- | src/comp/middle/trans.rs | 4 | ||||
| -rw-r--r-- | src/rt/rust_crate.cpp | 5 | ||||
| -rw-r--r-- | src/rt/rust_internal.h | 5 | ||||
| -rw-r--r-- | src/rt/rust_task.cpp | 4 |
4 files changed, 6 insertions, 12 deletions
diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index 880187df458..7c71a00f03c 100644 --- a/src/comp/middle/trans.rs +++ b/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 diff --git a/src/rt/rust_crate.cpp b/src/rt/rust_crate.cpp index 410f2bd0be9..6783d43c04c 100644 --- a/src/rt/rust_crate.cpp +++ b/src/rt/rust_crate.cpp @@ -12,11 +12,6 @@ rust_crate::get_relocation_diff() const { } 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); } diff --git a/src/rt/rust_internal.h b/src/rt/rust_internal.h index cb6dd162594..6bd638ed469 100644 --- a/src/rt/rust_internal.h +++ b/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 @@ public: 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 diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp index 09665e11298..db72be6d12d 100644 --- a/src/rt/rust_task.cpp +++ b/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 |