diff options
| author | Roy Frostig <rfrostig@mozilla.com> | 2010-07-28 14:00:44 -0700 |
|---|---|---|
| committer | Roy Frostig <rfrostig@mozilla.com> | 2010-07-28 14:00:44 -0700 |
| commit | 596d19e2ea1f2cc96f7e493171a692bc0b912ce6 (patch) | |
| tree | f9a4be20be28121856a359e31ba0d07c56bf1213 /src/rt | |
| parent | 80307576245aabf00285db020bbfbc4c3a891766 (diff) | |
| download | rust-596d19e2ea1f2cc96f7e493171a692bc0b912ce6.tar.gz rust-596d19e2ea1f2cc96f7e493171a692bc0b912ce6.zip | |
Test the deque a bit. Give it a get-by-index method. Fix two uncovered state-calculation bugs --- one decently, the other with an ugly hack. Bug on the latter coming right up.
Diffstat (limited to 'src/rt')
| -rw-r--r-- | src/rt/rust_crate_cache.cpp | 1 | ||||
| -rw-r--r-- | src/rt/rust_upcall.cpp | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/rt/rust_crate_cache.cpp b/src/rt/rust_crate_cache.cpp index 650e3bb1ef3..c5076639e9a 100644 --- a/src/rt/rust_crate_cache.cpp +++ b/src/rt/rust_crate_cache.cpp @@ -216,6 +216,7 @@ rust_crate_cache::get_type_desc(size_t size, "rust_crate_cache::descs[%" PRIdPTR "] = 0x%" PRIxPTR, i, descs[i]); td->descs[i] = descs[i]; + td->is_stateful |= descs[i]->is_stateful; } adjust_disp(td->copy_glue_off, descs[0], td); adjust_disp(td->drop_glue_off, descs[0], td); diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp index ff6874e4f48..8ce40b576cf 100644 --- a/src/rt/rust_upcall.cpp +++ b/src/rt/rust_upcall.cpp @@ -499,8 +499,13 @@ extern "C" CDECL uintptr_t upcall_require_c_sym(rust_task *task, } extern "C" CDECL type_desc * -upcall_get_type_desc(rust_task *task, rust_crate const *curr_crate, - size_t size, size_t align, size_t n_descs, type_desc const **descs) { +upcall_get_type_desc(rust_task *task, + rust_crate const *curr_crate, + size_t size, + size_t align, + size_t n_descs, + type_desc const **descs) +{ LOG_UPCALL_ENTRY(task); task->log(rust_log::UPCALL | rust_log::CACHE, "upcall get_type_desc with size=%" PRIdPTR |