---

yaml
---
r: 4807
b: refs/heads/master
c: 0467fa6
h: refs/heads/master
i:
  4805: 85791cf
  4803: 5681f56
  4799: f747cd9
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1739200b02d0714c6caaf47d7a09cab037a40682
+refs/heads/master: 0467fa6a009e620a1a7486938f5ffd25730d4df5

trunk/src/rt/intrinsics/intrinsics.cpp

@@ -10,7 +10,7 @@ upcall_fail(rust_task *task, char const *expr, char const *file, size_t line);
 
 extern "C" void
 rust_intrinsic_vec_len(rust_task *task, size_t *retptr, type_desc *ty,
-                       rust_vec *v)
+                       rust_evec *v)
 {
     *retptr = v->fill / ty->size;
 }

trunk/src/rt/rust_builtin.cpp

@@ -127,17 +127,17 @@ unsupervise(rust_task *task) {
 }
 
 /* Helper for str_alloc and str_from_vec.  Returns NULL as failure. */
-static rust_vec*
+static rust_evec*
 vec_alloc_with_data(rust_task *task,
                     size_t n_elts,
                     size_t fill,
                     size_t elt_size,
                     void *d)
 {
-    size_t alloc = next_power_of_two(sizeof(rust_vec) + (n_elts * elt_size));
-    void *mem = task->malloc(alloc, "rust_vec (with data)");
+    size_t alloc = next_power_of_two(sizeof(rust_evec) + (n_elts * elt_size));
+    void *mem = task->malloc(alloc, "rust_evec (with data)");
     if (!mem) return NULL;
-    return new (mem) rust_vec(alloc, fill * elt_size, (uint8_t*)d);
+    return new (mem) rust_evec(alloc, fill * elt_size, (uint8_t*)d);
 }
 
 extern "C" CDECL rust_str*
@@ -158,7 +158,7 @@ extern "C" CDECL rust_str*
 str_push_byte(rust_task* task, rust_str* v, size_t byte)
 {
     size_t fill = v->fill;
-    size_t alloc = next_power_of_two(sizeof(rust_vec) + fill + 1);
+    size_t alloc = next_power_of_two(sizeof(rust_evec) + fill + 1);
     if (v->ref_count > 1 || v->alloc < alloc) {
         v = vec_alloc_with_data(task, fill + 1, fill, 1, (void*)&v->data[0]);
         if (!v) {

trunk/src/rt/rust_shape.cpp

@@ -968,7 +968,7 @@ data<T,U>::walk_variant(bool align, tag_info &tinfo, uint32_t variant_id) {
 template<typename T,typename U>
 std::pair<uint8_t *,uint8_t *>
 data<T,U>::get_evec_data_range(ptr dp) {
-    rust_vec *vp = bump_dp<rust_vec *>(dp);
+    rust_evec *vp = bump_dp<rust_evec *>(dp);
     return std::make_pair(vp->data, vp->data + vp->fill);
 }
 

trunk/src/rt/rust_upcall.cpp

@@ -222,9 +222,9 @@ upcall_new_str(rust_task *task, char const *s, size_t fill) {
     return make_str(task, s, fill);
 }
 
-static rust_vec *
+static rust_evec *
 vec_grow(rust_task *task,
-         rust_vec *v,
+         rust_evec *v,
          size_t n_bytes,
          uintptr_t *need_copy,
          type_desc *td)
@@ -237,7 +237,7 @@ vec_grow(rust_task *task,
         v, n_bytes, v->ref_count, v->alloc, v->fill, need_copy);
 
     *need_copy = 0;
-    size_t alloc = next_power_of_two(sizeof(rust_vec) + v->fill + n_bytes);
+    size_t alloc = next_power_of_two(sizeof(rust_evec) + v->fill + n_bytes);
 
     if (v->ref_count == 1) {
 
@@ -249,7 +249,7 @@ vec_grow(rust_task *task,
 
         // Second-fastest path: can at least realloc.
         LOG(task, mem, "realloc path");
-        v = (rust_vec*) task->realloc(v, alloc, td->is_stateful);
+        v = (rust_evec*) task->realloc(v, alloc, td->is_stateful);
         if (!v) {
             task->fail();
             return NULL;
@@ -260,9 +260,9 @@ vec_grow(rust_task *task,
         /**
          * Slowest path: make a new vec.
          *
-         * 1. Allocate a new rust_vec with desired additional space.
-         * 2. Down-ref the shared rust_vec, point to the new one instead.
-         * 3. Copy existing elements into the new rust_vec.
+         * 1. Allocate a new rust_evec with desired additional space.
+         * 2. Down-ref the shared rust_evec, point to the new one instead.
+         * 3. Copy existing elements into the new rust_evec.
          *
          * 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
@@ -271,7 +271,7 @@ vec_grow(rust_task *task,
          * that we need the copies performed for us.
          */
         LOG(task, mem, "new vec path");
-        void *mem = task->malloc(alloc, "rust_vec (vec_grow)", td);
+        void *mem = task->malloc(alloc, "rust_evec (vec_grow)", td);
         if (!mem) {
             task->fail();
             return NULL;
@@ -280,10 +280,10 @@ vec_grow(rust_task *task,
         if (v->ref_count != CONST_REFCOUNT)
             v->deref();
 
-        v = new (mem) rust_vec(alloc, 0, NULL);
+        v = new (mem) rust_evec(alloc, 0, NULL);
         *need_copy = 1;
     }
-    I(sched, sizeof(rust_vec) + v->fill <= v->alloc);
+    I(sched, sizeof(rust_evec) + v->fill <= v->alloc);
     return v;
 }
 
@@ -309,14 +309,14 @@ copy_elements(rust_task *task, type_desc *elem_t,
 
 extern "C" CDECL void
 upcall_evec_append(rust_task *task, type_desc *t, type_desc *elem_t,
-                   rust_vec **dst_ptr, rust_vec *src, bool skip_null)
+                   rust_evec **dst_ptr, rust_evec *src, bool skip_null)
 {
     LOG_UPCALL_ENTRY(task);
-    rust_vec *dst = *dst_ptr;
+    rust_evec *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 = vec_grow(task, dst, n_src_bytes, &need_copy, t);
+    rust_evec *new_vec = vec_grow(task, dst, n_src_bytes, &need_copy, t);
 
     // If src and dst are the same (due to "v += v"), then dst getting
     // resized causes src to move as well.
@@ -341,7 +341,7 @@ upcall_evec_append(rust_task *task, type_desc *t, type_desc *elem_t,
 // FIXME: Transitional. Please remove.
 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) {
+                  rust_evec **dst_ptr, rust_evec *src, bool skip_null) {
     upcall_evec_append(task, t, elem_t, dst_ptr, src, skip_null);
 }
 

trunk/src/rt/rust_util.h

@@ -181,29 +181,29 @@ isaac_init(sched_or_kernel *sched, randctx *rctx)
 // Vectors (rust-user-code level).
 
 struct
-rust_vec : public rc_base<rust_vec>
+rust_evec : public rc_base<rust_evec>
 {
     size_t alloc;
     size_t fill;
     size_t pad; // Pad to align data[0] to 16 bytes.
     uint8_t data[];
-    rust_vec(size_t alloc, size_t fill,
+    rust_evec(size_t alloc, size_t fill,
              uint8_t const *d)
         : alloc(alloc),
           fill(fill)
     {
         if (d)
             memcpy(&data[0], d, fill);
     }
-    ~rust_vec() {}
+    ~rust_evec() {}
 
     inline void *operator new(size_t size, void *mem) {
         return mem;
     }
 };
 
-// Rust types vec and str look identical from our perspective.
-typedef rust_vec rust_str;
+// Strings are just exterior vecs
+typedef rust_evec rust_str;
 
 // Interior vectors (rust-user-code level).