---

yaml
---
r: 8083
b: refs/heads/snap-stage3
c: d3dfe87
h: refs/heads/master
i:
  8081: 07174e7
  8079: 6f6dd8b
v: v3

Author: killerswan

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 9f0239ce9c24972e8f50b4161130414965886348
+refs/heads/snap-stage3: d3dfe8758d674d41c3aae116385bcc2b992413ed
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/rt/rust_builtin.cpp

@@ -102,7 +102,7 @@ extern "C" CDECL void
 vec_reserve_shared(type_desc* ty, rust_vec** vp,
                    size_t n_elts) {
     rust_task *task = rust_task_thread::get_task();
-    reserve_vec(task, vp, n_elts * ty->size);
+    reserve_vec_exact(task, vp, n_elts * ty->size);
 }
 
 /**

branches/snap-stage3/src/rt/rust_util.h

@@ -178,15 +178,17 @@ inline size_t vec_size(size_t elems) {
     return sizeof(rust_vec) + sizeof(T) * elems;
 }
 
-inline void reserve_vec(rust_task* task, rust_vec** vpp, size_t size) {
+inline void reserve_vec_exact(rust_task* task, rust_vec** vpp, size_t size) {
     if (size > (*vpp)->alloc) {
-        size_t new_alloc = next_power_of_two(size);
-        *vpp = (rust_vec*)task->kernel->realloc(*vpp, new_alloc +
-                                                sizeof(rust_vec));
-        (*vpp)->alloc = new_alloc;
+        *vpp = (rust_vec*)task->kernel->realloc(*vpp, size + sizeof(rust_vec));
+        (*vpp)->alloc = size;
     }
 }
 
+inline void reserve_vec(rust_task* task, rust_vec** vpp, size_t size) {
+    reserve_vec_exact(task, vpp, next_power_of_two(size));
+}
+
 typedef rust_vec rust_str;
 
 inline rust_str *