From 1730d2e037fc41f31d0a90b2fde477f02f0fc798 Mon Sep 17 00:00:00 2001 From: Roy Frostig Date: Thu, 22 Jul 2010 17:47:32 -0700 Subject: Notify copy glue of dst-initialization and fix _vec.alloc issues in lib and runtime. Closes #109. --- src/rt/rust_builtin.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/rt/rust_builtin.cpp') diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp index 0b492de8..99fa9535 100644 --- a/src/rt/rust_builtin.cpp +++ b/src/rt/rust_builtin.cpp @@ -92,15 +92,15 @@ unsupervise(rust_task *task) { } extern "C" CDECL rust_vec* -vec_alloc(rust_task *task, type_desc *t, size_t n_elts) +vec_alloc(rust_task *task, type_desc *t, type_desc *elem_t, size_t n_elts) { rust_dom *dom = task->dom; task->log(rust_log::MEM, - "vec_alloc %" PRIdPTR " elements of size %" PRIdPTR, - n_elts, t->size); - size_t fill = n_elts * t->size; + "vec_alloc %" PRIdPTR " elements of size %" PRIdPTR, + n_elts, elem_t->size); + size_t fill = n_elts * elem_t->size; size_t alloc = next_power_of_two(sizeof(rust_vec) + fill); - void *mem = dom->malloc(alloc); + void *mem = task->malloc(alloc, t->is_stateful ? t : NULL); if (!mem) { task->fail(3); return NULL; -- cgit v1.2.3