Implement non-internal ivecs

Vectors are now similar to our old, pre-internal vectors, except that
they are uniquely owned, not refcounted.

Their name should probably change too, then. I've renamed them to vec
in the runtime, will do so throughout the compiler later.

Author: marijnh

Makefile.in

@@ -62,7 +62,7 @@ endif
 # runtime used directly by the compiler -- the binaries built by the
 # snapshot won't know about the changes yet. Don't leave this on. Turn
 # it on, shapshot, and turn it off again.
-# CFG_USE_SNAP_LIBS_FOR_STAGE1 = 1
+CFG_USE_SNAP_LIBS_FOR_STAGE1 = 1
 
 # version-string calculation
 CFG_GIT_DIR := $(CFG_SRC_DIR).git

src/comp/back/abi.rs

@@ -92,24 +92,12 @@ const closure_elt_bindings: int = 1;
 
 const closure_elt_ty_params: int = 2;
 
-const ivec_default_length: uint = 4u;
+const ivec_elt_fill: uint = 0u;
 
-const ivec_elt_len: uint = 0u;
-
-const ivec_elt_alen: uint = 1u;
+const ivec_elt_alloc: uint = 1u;
 
 const ivec_elt_elems: uint = 2u;
 
-const ivec_heap_stub_elt_zero: uint = 0u;
-
-const ivec_heap_stub_elt_alen: uint = 1u;
-
-const ivec_heap_stub_elt_ptr: uint = 2u;
-
-const ivec_heap_elt_len: uint = 0u;
-
-const ivec_heap_elt_elems: uint = 1u;
-
 const worst_case_glue_call_args: int = 7;
 
 const abi_version: uint = 1u;

src/comp/back/upcall.rs

@@ -40,10 +40,7 @@ type upcalls =
      new_str: ValueRef,
      evec_append: ValueRef,
      get_type_desc: ValueRef,
-     ivec_resize: ValueRef,
-     ivec_spill: ValueRef,
-     ivec_resize_shared: ValueRef,
-     ivec_spill_shared: ValueRef,
+     ivec_grow: ValueRef,
      ivec_push: ValueRef,
      cmp_type: ValueRef,
      log_type: ValueRef,
@@ -95,19 +92,13 @@ fn declare_upcalls(_tn: type_names, tydesc_type: TypeRef,
               d(~"get_type_desc",
                 [T_ptr(T_nil()), T_size_t(), T_size_t(), T_size_t(),
                  T_ptr(T_ptr(tydesc_type)), T_int()], T_ptr(tydesc_type)),
-          ivec_resize:
-              d(~"ivec_resize", [T_ptr(T_opaque_ivec()), T_int()], T_void()),
-          ivec_spill:
-              d(~"ivec_spill", [T_ptr(T_opaque_ivec()), T_int()], T_void()),
-          ivec_resize_shared:
-              d(~"ivec_resize_shared", [T_ptr(T_opaque_ivec()), T_int()],
-                T_void()),
-          ivec_spill_shared:
-              d(~"ivec_spill_shared", [T_ptr(T_opaque_ivec()), T_int()],
+          ivec_grow:
+              d(~"vec_grow", [T_ptr(T_ptr(T_opaque_ivec())), T_int()],
                 T_void()),
           ivec_push:
-              d(~"ivec_push", [T_ptr(T_opaque_ivec()), T_ptr(tydesc_type),
-                              T_ptr(T_i8())], T_void()),
+              d(~"vec_push",
+                [T_ptr(T_ptr(T_opaque_ivec())), T_ptr(tydesc_type),
+                 T_ptr(T_i8())], T_void()),
           cmp_type:
               dr(~"cmp_type",
                  [T_ptr(T_i1()), taskptr_type, T_ptr(tydesc_type),

src/comp/middle/shape.rs

@@ -313,7 +313,6 @@ fn shape_of(ccx: &@crate_ctxt, t: ty::t) -> [u8] {
         s += [shape_ivec];
         add_bool(s, true); // type is POD
         let unit_ty = ty::mk_mach(ccx.tcx, ast::ty_u8);
-        add_size_hint(ccx, s, unit_ty);
         add_substr(s, shape_of(ccx, unit_ty));
       }
 
@@ -365,7 +364,6 @@ fn shape_of(ccx: &@crate_ctxt, t: ty::t) -> [u8] {
       ty::ty_vec(mt) {
         s += [shape_ivec];
         add_bool(s, ty::type_is_pod(ccx.tcx, mt.ty));
-        add_size_hint(ccx, s, mt.ty);
         add_substr(s, shape_of(ccx, mt.ty));
       }
       ty::ty_rec(fields) {
@@ -416,14 +414,6 @@ fn shape_of(ccx: &@crate_ctxt, t: ty::t) -> [u8] {
     ret s;
 }
 
-fn add_size_hint(ccx: &@crate_ctxt, s: &mutable [u8], typ: ty::t) {
-    if ty::type_has_dynamic_size(ccx.tcx, typ) { s += [0u8, 0u8, 0u8]; ret; }
-
-    let llty = trans::type_of(ccx, dummy_sp(), typ);
-    add_u16(s, trans::llsize_of_real(ccx, llty) as u16);
-    s += [trans::llalign_of_real(ccx, llty) as u8];
-}
-
 // FIXME: We might discover other variants as we traverse these. Handle this.
 fn shape_of_variant(ccx: &@crate_ctxt, v: &ty::variant_info) -> [u8] {
     let s = [];