Merge branch 'rt-changes' into incoming

Author: msullivan

src/libcore/sys.rs

@@ -10,9 +10,8 @@ export log_str;
 export lock_and_signal, condition, methods;
 
 enum type_desc = {
-    first_param: **libc::c_int,
-    size: libc::size_t,
-    align: libc::size_t
+    size: uint,
+    align: uint
     // Remaining fields not listed
 };
 

src/libstd/arena.rs

@@ -31,11 +31,11 @@ impl arena for arena {
         head = chunk(uint::next_power_of_two(new_min_chunk_size + 1u));
         self.chunks = @cons(head, self.chunks);
 
-        ret self.alloc(n_bytes, align);
+        ret self.alloc_inner(n_bytes, align);
     }
 
     #[inline(always)]
-    fn alloc(n_bytes: uint, align: uint) -> *() {
+    fn alloc_inner(n_bytes: uint, align: uint) -> *() {
         let alignm1 = align - 1u;
         let mut head = list::head(self.chunks);
 
@@ -52,5 +52,13 @@ impl arena for arena {
             ret unsafe::reinterpret_cast(p);
         }
     }
+
+    #[inline(always)]
+    fn alloc(tydesc: *()) -> *() {
+        unsafe {
+            let tydesc = tydesc as *sys::type_desc;
+            self.alloc_inner((*tydesc).size, (*tydesc).align)
+        }
+    }
 }
 

src/libsyntax/ext/auto_serialize.rs

@@ -459,7 +459,6 @@ fn ser_ty(cx: ext_ctxt, tps: ser_tps_map,
         ~[]
       }
 
-      ast::ty_vstore(@{node: ast::ty_vec(mt),_}, ast::vstore_uniq) |
       ast::ty_vec(mt) {
         let ser_e =
             cx.expr(
@@ -477,6 +476,11 @@ fn ser_ty(cx: ext_ctxt, tps: ser_tps_map,
         }]
       }
 
+      // For unique vstores, just pass through to the underlying vec or str
+      ast::ty_vstore(ty, ast::vstore_uniq) {
+        ser_ty(cx, tps, ty, s, v)
+      }
+
       ast::ty_vstore(_, _) {
         cx.span_unimpl(ty.span, "serialization for vstore types");
       }
@@ -685,12 +689,16 @@ fn deser_ty(cx: ext_ctxt, tps: deser_tps_map,
         #ast{ fail }
       }
 
-      ast::ty_vstore(@{node: ast::ty_vec(mt),_}, ast::vstore_uniq) |
       ast::ty_vec(mt) {
         let l = deser_lambda(cx, tps, mt.ty, cx.clone(d));
         #ast{ std::serialization::read_to_vec($(d), $(l)) }
       }
 
+      // For unique vstores, just pass through to the underlying vec or str
+      ast::ty_vstore(ty, ast::vstore_uniq) {
+        deser_ty(cx, tps, ty, d)
+      }
+
       ast::ty_vstore(_, _) {
         cx.span_unimpl(ty.span, "deserialization for vstore types");
       }

src/rt/rust_shape.cpp

@@ -484,8 +484,7 @@ log::walk_res2(const rust_fn *dtor, const uint8_t *end_sp) {
 
 extern "C" void
 shape_cmp_type(int8_t *result, const type_desc *tydesc,
-               const type_desc **subtydescs, uint8_t *data_0,
-               uint8_t *data_1, uint8_t cmp_type) {
+               uint8_t *data_0, uint8_t *data_1, uint8_t cmp_type) {
     rust_task *task = rust_get_current_task();
     shape::arena arena;
 

src/rt/rust_shape.h

@@ -407,10 +407,6 @@ ctxt<T>::walk_tag0() {
     // Determine the size and alignment.
     tinfo.tag_sa = get_size_align(tinfo.info_ptr);
 
-    // Read in a dummy value; this used to be the number of parameters
-    uint16_t number_of_params = get_u16_bump(sp);
-    assert(number_of_params == 0 && "tag has type parameters on it");
-
     // Call to the implementation.
     static_cast<T *>(this)->walk_tag1(tinfo);
 }
@@ -489,10 +485,6 @@ ctxt<T>::walk_res0() {
         reinterpret_cast<const rust_fn **>(tables->resources);
     const rust_fn *dtor = resources[dtor_offset];
 
-    // Read in a dummy value; this used to be the number of parameters
-    uint16_t number_of_params = get_u16_bump(sp);
-    assert(number_of_params == 0 && "resource has type parameters on it");
-
     uint16_t sp_size = get_u16_bump(sp);
     const uint8_t *end_sp = sp + sp_size;
 

src/rt/rust_type.h

@@ -45,24 +45,15 @@ static inline void *box_body(rust_opaque_box *box) {
     return (void*)(box + 1);
 }
 
-// N.B. If you want to add a field to tydesc, please use one of the
-// unused fields!
 struct type_desc {
-    uintptr_t UNUSED_1;
     size_t size;
     size_t align;
     glue_fn *take_glue;
     glue_fn *drop_glue;
     glue_fn *free_glue;
     glue_fn *visit_glue;
-    uintptr_t UNUSED_2;
-    uintptr_t UNUSED_3;
-    uintptr_t UNUSED_4;
-    uintptr_t UNUSED_5;
     const uint8_t *shape;
     const rust_shape_tables *shape_tables;
-    uintptr_t UNUSED_6;
-    uintptr_t UNUSED_7;
 };
 
 extern "C" type_desc *rust_clone_type_desc(type_desc*);

src/rt/rust_upcall.cpp

@@ -335,59 +335,6 @@ upcall_str_new_shared(const char *cstr, size_t len) {
 }
 
 
-struct s_vec_grow_args {
-    rust_task *task;
-    rust_vec_box** vp;
-    size_t new_sz;
-};
-
-extern "C" CDECL void
-upcall_s_vec_grow(s_vec_grow_args *args) {
-    rust_task *task = args->task;
-    LOG_UPCALL_ENTRY(task);
-    reserve_vec(task, args->vp, args->new_sz);
-    (*args->vp)->body.fill = args->new_sz;
-}
-
-extern "C" CDECL void
-upcall_vec_grow(rust_vec_box** vp, size_t new_sz) {
-    rust_task *task = rust_get_current_task();
-    s_vec_grow_args args = {task, vp, new_sz};
-    UPCALL_SWITCH_STACK(task, &args, upcall_s_vec_grow);
-}
-
-struct s_str_concat_args {
-    rust_task *task;
-    rust_vec_box* lhs;
-    rust_vec_box* rhs;
-    rust_vec_box* retval;
-};
-
-extern "C" CDECL void
-upcall_s_str_concat(s_str_concat_args *args) {
-    rust_vec *lhs = &args->lhs->body;
-    rust_vec *rhs = &args->rhs->body;
-    rust_task *task = args->task;
-    size_t fill = lhs->fill + rhs->fill - 1;
-    rust_vec_box* v = (rust_vec_box*)
-        task->kernel->malloc(fill + sizeof(rust_vec_box),
-                             "str_concat");
-    v->header.td = args->lhs->header.td;
-    v->body.fill = v->body.alloc = fill;
-    memmove(&v->body.data[0], &lhs->data[0], lhs->fill - 1);
-    memmove(&v->body.data[lhs->fill - 1], &rhs->data[0], rhs->fill);
-    args->retval = v;
-}
-
-extern "C" CDECL rust_vec_box*
-upcall_str_concat(rust_vec_box* lhs, rust_vec_box* rhs) {
-    rust_task *task = rust_get_current_task();
-    s_str_concat_args args = {task, lhs, rhs, 0};
-    UPCALL_SWITCH_STACK(task, &args, upcall_s_str_concat);
-    return args.retval;
-}
-
-
 extern "C" _Unwind_Reason_Code
 __gxx_personality_v0(int version,
                      _Unwind_Action actions,
@@ -444,30 +391,27 @@ upcall_rust_personality(int version,
 
 extern "C" void
 shape_cmp_type(int8_t *result, const type_desc *tydesc,
-               const type_desc **subtydescs, uint8_t *data_0,
-               uint8_t *data_1, uint8_t cmp_type);
+               uint8_t *data_0, uint8_t *data_1, uint8_t cmp_type);
 
 struct s_cmp_type_args {
     int8_t *result;
     const type_desc *tydesc;
-    const type_desc **subtydescs;
     uint8_t *data_0;
     uint8_t *data_1;
     uint8_t cmp_type;
 };
 
 extern "C" void
 upcall_s_cmp_type(s_cmp_type_args *args) {
-    shape_cmp_type(args->result, args->tydesc, args->subtydescs,
+    shape_cmp_type(args->result, args->tydesc,
                    args->data_0, args->data_1, args->cmp_type);
 }
 
 extern "C" void
 upcall_cmp_type(int8_t *result, const type_desc *tydesc,
-                const type_desc **subtydescs, uint8_t *data_0,
-                uint8_t *data_1, uint8_t cmp_type) {
+                uint8_t *data_0, uint8_t *data_1, uint8_t cmp_type) {
     rust_task *task = rust_get_current_task();
-    s_cmp_type_args args = {result, tydesc, subtydescs,
+    s_cmp_type_args args = {result, tydesc,
                             data_0, data_1, cmp_type};
     UPCALL_SWITCH_STACK(task, &args, upcall_s_cmp_type);
 }

src/rt/rust_util.cpp

@@ -15,21 +15,14 @@ uint8_t str_body_shape[] = {
 };
 
 struct type_desc str_body_tydesc = {
-    0, // unused
     1, // size
     1, // align
     NULL, // take_glue
     NULL, // drop_glue
     NULL, // free_glue
     NULL, // visit_glue
-    0, // unused
-    0, // unused
-    0, // unused
-    0, // unused
     str_body_shape, // shape
     &empty_shape_tables, // shape_tables
-    0, // unused
-    0, // unused
 };
 
 //

src/rt/rustrt.def.in

@@ -76,11 +76,8 @@ upcall_validate_box
 upcall_log_type
 upcall_malloc
 upcall_rust_personality
-upcall_vec_grow
-upcall_str_new
 upcall_str_new_uniq
 upcall_str_new_shared
-upcall_str_concat
 upcall_call_shim_on_c_stack
 upcall_call_shim_on_rust_stack
 upcall_new_stack

src/rustc/back/abi.rs

@@ -33,22 +33,15 @@ const box_field_body: uint = 4u;
 
 const general_code_alignment: uint = 16u;
 
-const tydesc_field_first_param: uint = 0u;
-const tydesc_field_size: uint = 1u;
-const tydesc_field_align: uint = 2u;
-const tydesc_field_take_glue: uint = 3u;
-const tydesc_field_drop_glue: uint = 4u;
-const tydesc_field_free_glue: uint = 5u;
-const tydesc_field_visit_glue: uint = 6u;
-const tydesc_field_sever_glue: uint = 7u;
-const tydesc_field_mark_glue: uint = 8u;
-const tydesc_field_unused2: uint = 9u;
-const tydesc_field_unused_2: uint = 10u;
-const tydesc_field_shape: uint = 11u;
-const tydesc_field_shape_tables: uint = 12u;
-const tydesc_field_n_params: uint = 13u;
-const tydesc_field_obj_params: uint = 14u; // FIXME unused (#2351)
-const n_tydesc_fields: uint = 15u;
+const tydesc_field_size: uint = 0u;
+const tydesc_field_align: uint = 1u;
+const tydesc_field_take_glue: uint = 2u;
+const tydesc_field_drop_glue: uint = 3u;
+const tydesc_field_free_glue: uint = 4u;
+const tydesc_field_visit_glue: uint = 5u;
+const tydesc_field_shape: uint = 6u;
+const tydesc_field_shape_tables: uint = 7u;
+const n_tydesc_fields: uint = 8u;
 
 const cmp_glue_op_eq: uint = 0u;
 

src/rustc/back/upcall.rs

@@ -16,10 +16,8 @@ type upcalls =
      exchange_free: ValueRef,
      validate_box: ValueRef,
      mark: ValueRef,
-     vec_grow: ValueRef,
      str_new_uniq: ValueRef,
      str_new_shared: ValueRef,
-     str_concat: ValueRef,
      cmp_type: ValueRef,
      log_type: ValueRef,
      alloc_c_stack: ValueRef,
@@ -71,22 +69,16 @@ fn declare_upcalls(targ_cfg: @session::config,
               nothrow(dv("validate_box", ~[T_ptr(T_i8())])),
           mark:
               d("mark", ~[T_ptr(T_i8())], int_t),
-          vec_grow:
-              nothrow(dv("vec_grow", ~[T_ptr(T_ptr(T_i8())), int_t])),
           str_new_uniq:
               nothrow(d("str_new_uniq", ~[T_ptr(T_i8()), int_t],
                         T_ptr(T_i8()))),
           str_new_shared:
               nothrow(d("str_new_shared", ~[T_ptr(T_i8()), int_t],
                         T_ptr(T_i8()))),
-          str_concat:
-              nothrow(d("str_concat", ~[T_ptr(T_i8()),
-                                       T_ptr(T_i8())],
-                        T_ptr(T_i8()))),
           cmp_type:
               dv("cmp_type",
                  ~[T_ptr(T_i1()), T_ptr(tydesc_type),
-                  T_ptr(T_ptr(tydesc_type)), T_ptr(T_i8()),
+                  T_ptr(T_i8()),
                   T_ptr(T_i8()),
                   T_i8()]),
           log_type: