diff options
| author | Rafael Ávila de Espíndola <respindola@mozilla.com> | 2011-05-24 18:52:31 -0400 |
|---|---|---|
| committer | Rafael Ávila de Espíndola <respindola@mozilla.com> | 2011-05-24 18:52:31 -0400 |
| commit | de2e84e5b044d8635387bacd37d6088bd8dffd66 (patch) | |
| tree | 42c80d0ce29be3528d31d66003027d5654f82f71 /src | |
| parent | 31de8e15c0f9575c236fc87fbbf02bd08e3b8842 (diff) | |
| download | rust-de2e84e5b044d8635387bacd37d6088bd8dffd66.tar.gz rust-de2e84e5b044d8635387bacd37d6088bd8dffd66.zip | |
Only one gc glue.
Diffstat (limited to 'src')
| -rw-r--r-- | src/comp/middle/trans.rs | 6 | ||||
| -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 | 2 |
4 files changed, 6 insertions, 12 deletions
diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index 9895cb47d12..42cbaf16fa6 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -503,7 +503,7 @@ fn T_crate(&type_names tn) -> TypeRef { T_int(), // size_t activate_glue T_int(), // size_t yield_glue T_int(), // size_t unwind_glue - T_int(), // size_t gc_glue + T_int(), // size_t pad T_int(), // size_t pad T_int(), // int n_rust_syms T_int(), // int n_c_syms @@ -7668,10 +7668,10 @@ fn create_crate_constant(ValueRef crate_ptr, @glue_fns glues) { C_null(T_int()), // ptrdiff_t debug_info_off C_null(T_int()), // size_t debug_info_sz C_null(T_int()), // size_t pad - C_null(T_int()), // size_t pad C_null(T_int()), // size_t pad2 - C_null(T_int()), // size_t gc_glue_off C_null(T_int()), // size_t pad3 + C_null(T_int()), // size_t pad4 + C_null(T_int()), // size_t pad5 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 2e312c8c564..0b63e4bd40e 100644 --- a/src/rt/rust_crate.cpp +++ b/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_gc_glue() const { - return ((uintptr_t)this + gc_glue_off); -} - rust_crate::mem_area::mem_area(rust_dom *dom, uintptr_t pos, size_t sz) : dom(dom), base(pos), diff --git a/src/rt/rust_internal.h b/src/rt/rust_internal.h index 03022812a09..9d7f0e56ad1 100644 --- a/src/rt/rust_internal.h +++ b/src/rt/rust_internal.h @@ -231,11 +231,11 @@ class rust_crate { ptrdiff_t debug_info_off; // Offset from this to .debug_info. size_t debug_info_sz; // Size of .debug_info. - ptrdiff_t activate_glue_off; ptrdiff_t pad; ptrdiff_t pad2; - ptrdiff_t gc_glue_off; ptrdiff_t pad3; + ptrdiff_t pad4; + ptrdiff_t pad5; public: @@ -247,7 +247,6 @@ public: uintptr_t get_image_base() const; ptrdiff_t get_relocation_diff() 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 bd57eb89cca..b660c5fb545 100644 --- a/src/rt/rust_task.cpp +++ b/src/rt/rust_task.cpp @@ -380,7 +380,7 @@ rust_task::gc(size_t nargs) { DLOG(dom, task, "task %s @0x%" PRIxPTR " garbage collecting", name, this); - run_after_return(nargs, dom->root_crate->get_gc_glue()); + // run_after_return(nargs, rust_gc_glue); } void |