---

yaml
---
r: 14341
b: refs/heads/try
c: d23cd8f
h: refs/heads/master
i:
  14339: f079661
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: a3fdd8c93f9aab540fc4edc0984e79c7dee467a5
+refs/heads/try: d23cd8f52fbfb41844b27c5e65cb620c34c7af59
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_upcall.cpp

@@ -434,7 +434,7 @@ upcall_vec_grow(rust_vec** vp, size_t new_sz) {
 // Copy elements from one vector to another,
 // dealing with reference counts
 static inline void
-copy_elements(rust_task *task, type_desc *elem_t,
+copy_elements(type_desc *elem_t,
               void *pdst, void *psrc, size_t n) {
     char *dst = (char *)pdst, *src = (char *)psrc;
     memmove(dst, src, n);
@@ -454,12 +454,10 @@ extern "C" CDECL void
 upcall_vec_push(rust_vec** vp, type_desc* elt_ty, void* elt) {
     // NB: This runs entirely on the Rust stack because it invokes take glue
 
-    rust_task *task = rust_task_thread::get_task();
-
     size_t new_sz = (*vp)->fill + elt_ty->size;
-    reserve_vec(task, vp, new_sz);
+    reserve_vec_fast(vp, new_sz);
     rust_vec* v = *vp;
-    copy_elements(task, elt_ty, &v->data[0] + v->fill,
+    copy_elements(elt_ty, &v->data[0] + v->fill,
                   elt, elt_ty->size);
     v->fill += elt_ty->size;
 }

branches/try/src/rt/rust_util.h

@@ -189,6 +189,18 @@ inline void reserve_vec(rust_task* task, rust_vec** vpp, size_t size) {
     reserve_vec_exact(task, vpp, next_power_of_two(size));
 }
 
+// Call this when you don't already have a task pointer and it will
+// avoid hitting the TLS if it doesn't have to
+inline void reserve_vec_fast(rust_vec **vpp, size_t size) {
+    size_t new_size = next_power_of_two(size);
+    if (new_size > (*vpp)->alloc) {
+        rust_task *task = rust_task_thread::get_task();
+        size_t alloc_size = new_size + sizeof(rust_vec);
+        *vpp = (rust_vec*)task->kernel->realloc(*vpp, alloc_size);
+        (*vpp)->alloc = new_size;
+    }
+}
+
 typedef rust_vec rust_str;
 
 inline rust_str *