---

yaml
---
r: 3087
b: refs/heads/master
c: 95def69
h: refs/heads/master
i:
  3085: 893c78c
  3083: 08eb4f3
  3079: 8b9ec32
  3071: fa4a634
v: v3

Author: msullivan

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 491d1106454c9ffa3950afe27ea3488ef5c19e32
+refs/heads/master: 95def699f10b9ec92721d6057a86c454c3c64122

trunk/src/comp/back/upcall.rs

@@ -5,6 +5,7 @@ import trans::decl_cdecl_fn;
 import trans::T_f32;
 import trans::T_f64;
 import trans::T_fn;
+import trans::T_bool;
 import trans::T_i8;
 import trans::T_i32;
 import trans::T_int;
@@ -53,6 +54,7 @@ type upcalls = rec(
     ValueRef new_str,
     ValueRef new_vec,
     ValueRef vec_grow,
+    ValueRef vec_append,
     ValueRef get_type_desc,
     ValueRef new_task,
     ValueRef start_task,
@@ -111,6 +113,9 @@ fn declare_upcalls(type_names tn, ModuleRef llmod) -> @upcalls {
         vec_grow=d("vec_grow", [T_opaque_vec_ptr(), T_size_t(),
                                    T_ptr(T_int()), T_ptr(T_tydesc(tn))],
                    T_opaque_vec_ptr()),
+        vec_append=d("vec_append", [T_ptr(T_tydesc(tn)), T_ptr(T_tydesc(tn)),
+                                    T_ptr(T_opaque_vec_ptr()),
+                                    T_opaque_vec_ptr(), T_bool()], T_void()),
         get_type_desc=d("get_type_desc",
                         [T_ptr(T_nil()), T_size_t(), T_size_t(),
                          T_size_t(), T_ptr(T_ptr(T_tydesc(tn)))],

trunk/src/comp/middle/trans.rs

@@ -3681,7 +3681,7 @@ fn trans_vec_append(&@block_ctxt cx, &ty::t t,
     auto dst = bcx.build.PointerCast(lhs, T_ptr(T_opaque_vec_ptr()));
     auto src = bcx.build.PointerCast(rhs, T_opaque_vec_ptr());
 
-    ret res(bcx, bcx.build.FastCall(cx.fcx.lcx.ccx.glues.vec_append_glue,
+    ret res(bcx, bcx.build.Call(cx.fcx.lcx.ccx.upcalls.vec_append,
                                     [cx.fcx.lltaskptr,
                                         llvec_tydesc.val,
                                         llelt_tydesc.val,

trunk/src/rt/rust_upcall.cpp

@@ -415,7 +415,7 @@ upcall_vec_grow(rust_task *task,
          *
          * Step 3 is a bit tricky.  We don't know how to properly copy the
          * elements in the runtime (all we have are bits in a buffer; no
-         * type infromation and no copy glue).  What we do instead is set the
+         * type information and no copy glue).  What we do instead is set the
          * need_copy outparam flag to indicate to our caller (vec-copy glue)
          * that we need the copies performed for us.
          */
@@ -436,6 +436,53 @@ upcall_vec_grow(rust_task *task,
     return v;
 }
 
+// Copy elements from one vector to another,
+// dealing with reference counts
+static inline void
+copy_elements(rust_task *task, type_desc *elem_t,
+              void *pdst, void *psrc, size_t n)
+{
+    char *dst = (char *)pdst, *src = (char *)psrc;
+
+    // increment the refcount of each element of the vector
+    if (elem_t->take_glue) {
+        glue_fn *take_glue = elem_t->take_glue;
+        size_t elem_size = elem_t->size;
+        const type_desc **tydescs = elem_t->first_param;
+        for (char *p = src; p < src+n; p += elem_size) {
+            take_glue(NULL, task, NULL, tydescs, p);
+        }
+    }
+    memmove(dst, src, n);
+}
+
+extern "C" CDECL void
+upcall_vec_append(rust_task *task, type_desc *t, type_desc *elem_t,
+                  rust_vec **dst_ptr, rust_vec *src, bool skip_null)
+{
+    LOG_UPCALL_ENTRY(task);
+    rust_vec *dst = *dst_ptr;
+    uintptr_t need_copy;
+    size_t n_src_bytes = skip_null ? src->fill - 1 : src->fill;
+    size_t n_dst_bytes = skip_null ? dst->fill - 1 : dst->fill;
+    rust_vec *new_vec = upcall_vec_grow(task, dst, n_src_bytes,
+                                        &need_copy, t);
+
+    if (need_copy) {
+        // Copy any dst elements in, omitting null if doing str.
+        copy_elements(task, elem_t, &new_vec->data, &dst->data, n_dst_bytes);
+    }
+
+    // Copy any src elements in, carrying along null if doing str.
+    void *new_end = (void *)((char *)new_vec->data + n_dst_bytes);
+    copy_elements(task, elem_t, new_end, &src->data, src->fill);
+    new_vec->fill = n_dst_bytes + src->fill;
+
+    // Write new_vec back through the alias we were given.
+    *dst_ptr = new_vec;
+}
+
+
 extern "C" CDECL type_desc *
 upcall_get_type_desc(rust_task *task,
                      void *curr_crate, // ignored, legacy compat.

trunk/src/rt/rustrt.def.in

@@ -73,6 +73,7 @@ upcall_start_thread
 upcall_trace_str
 upcall_trace_word
 upcall_vec_grow
+upcall_vec_append
 upcall_yield
 vec_alloc
 vec_alloc_mut