---

yaml
---
r: 3086
b: refs/heads/master
c: 491d110
h: refs/heads/master
v: v3

Author: msullivan

[refs]

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

trunk/src/comp/middle/trans.rs

@@ -2274,31 +2274,6 @@ fn make_free_glue(&@block_ctxt cx, ValueRef v0, &ty::t t) {
     rslt.bcx.build.RetVoid();
 }
 
-fn maybe_free_ivec_heap_part(&@block_ctxt cx, ValueRef v0, ty::t unit_ty)
-        -> result {
-    auto llunitty = type_of_or_i8(cx, unit_ty);
-
-    auto stack_len = cx.build.Load(cx.build.InBoundsGEP(v0, [C_int(0),
-        C_uint(abi::ivec_elt_len)]));
-    auto maybe_on_heap_cx = new_sub_block_ctxt(cx, "maybe_on_heap");
-    auto next_cx = new_sub_block_ctxt(cx, "next");
-    auto maybe_on_heap = cx.build.ICmp(lib::llvm::LLVMIntEQ, stack_len,
-                                       C_int(0));
-    cx.build.CondBr(maybe_on_heap, maybe_on_heap_cx.llbb, next_cx.llbb);
-
-    // Might be on the heap. Load the heap pointer and free it. (It's ok to
-    // free a null pointer.)
-    auto stub_ptr = maybe_on_heap_cx.build.PointerCast(v0,
-        T_ptr(T_ivec_heap(llunitty)));
-    auto heap_ptr = maybe_on_heap_cx.build.Load(
-        maybe_on_heap_cx.build.InBoundsGEP(stub_ptr,
-            [C_int(0), C_uint(abi::ivec_heap_stub_elt_ptr)]));
-    auto after_free_cx = trans_non_gc_free(maybe_on_heap_cx, heap_ptr).bcx;
-    after_free_cx.build.Br(next_cx.llbb);
-
-    ret res(next_cx, C_nil());
-}
-
 fn make_drop_glue(&@block_ctxt cx, ValueRef v0, &ty::t t) {
     // NB: v0 is an *alias* of type t here, not a direct value.
     auto rslt;
@@ -2311,11 +2286,6 @@ fn make_drop_glue(&@block_ctxt cx, ValueRef v0, &ty::t t) {
             rslt = decr_refcnt_maybe_free(cx, v0, v0, t);
         }
 
-        case (ty::ty_ivec(?tm)) {
-            rslt = iter_structural_ty(cx, v0, t, drop_ty);
-            rslt = maybe_free_ivec_heap_part(rslt.bcx, v0, tm.ty);
-        }
-
         case (ty::ty_box(_)) {
             rslt = decr_refcnt_maybe_free(cx, v0, v0, t);
         }
@@ -3718,10 +3688,10 @@ fn trans_vec_append(&@block_ctxt cx, &ty::t t,
                                         dst, src, skip_null]));
 }
 
-// Returns a tuple consisting of a pointer to the newly-reserved space and a
-// block context. Updates the length appropriately.
+// Returns a tuple consisting of a pointer to the length (to be updated), a
+// pointer to the newly-reserved space, and a block context.
 fn reserve_ivec_space(&@block_ctxt cx, TypeRef llunitty, ValueRef v,
-        ValueRef len_needed) -> result {
+        ValueRef len_needed) -> tup(ValueRef, ValueRef, @block_ctxt) {
     auto stack_len_ptr = cx.build.InBoundsGEP(v, [C_int(0),
                                                   C_uint(abi::ivec_elt_len)]);
     auto stack_len = cx.build.Load(stack_len_ptr);
@@ -3755,7 +3725,7 @@ fn reserve_ivec_space(&@block_ctxt cx, TypeRef llunitty, ValueRef v,
 
     // We're definitely on the heap. Check whether we need to resize.
     auto heap_len_ptr = on_heap_cx.build.InBoundsGEP(heap_ptr, [C_int(0),
-        C_uint(abi::ivec_heap_elt_len)]);
+                                                                C_int(0)]);
     auto heap_len = on_heap_cx.build.Load(heap_len_ptr);
     auto new_heap_len = on_heap_cx.build.Add(heap_len, len_needed);
     auto heap_len_unscaled = on_heap_cx.build.UDiv(heap_len,
@@ -3770,7 +3740,6 @@ fn reserve_ivec_space(&@block_ctxt cx, TypeRef llunitty, ValueRef v,
     // Case (1): We're on the heap and don't need to resize.
     auto heap_data_no_resize = heap_no_resize_cx.build.InBoundsGEP(heap_ptr,
         [C_int(0), C_uint(abi::ivec_heap_elt_elems), heap_len_unscaled]);
-    heap_no_resize_cx.build.Store(new_heap_len, heap_len_ptr);
     heap_no_resize_cx.build.Br(next_cx.llbb);
 
     // Case (2): We're on the heap and need to resize. This path is rare, so
@@ -3802,7 +3771,6 @@ fn reserve_ivec_space(&@block_ctxt cx, TypeRef llunitty, ValueRef v,
     // Case (3): We're on the stack and don't need to spill.
     auto stack_data_no_spill = stack_no_spill_cx.build.InBoundsGEP(v,
         [C_int(0), C_uint(abi::ivec_elt_elems), stack_len_unscaled]);
-    stack_no_spill_cx.build.Store(new_stack_len, stack_len_ptr);
     stack_no_spill_cx.build.Br(next_cx.llbb);
 
     // Case (4): We're on the stack and need to spill. Like case (2), this
@@ -3826,12 +3794,16 @@ fn reserve_ivec_space(&@block_ctxt cx, TypeRef llunitty, ValueRef v,
     stack_spill_cx.build.Br(next_cx.llbb);
 
     // Phi together the different data pointers to get the result.
+    auto len_ptr = next_cx.build.Phi(T_ptr(T_int()),
+        [heap_len_ptr, heap_len_ptr, stack_len_ptr, heap_len_ptr_spill],
+        [heap_no_resize_cx.llbb, heap_resize_cx.llbb, stack_no_spill_cx.llbb,
+         stack_spill_cx.llbb]);
     auto data_ptr = next_cx.build.Phi(T_ptr(llunitty),
         [heap_data_no_resize, heap_data_resize, stack_data_no_spill,
          heap_data_spill],
         [heap_no_resize_cx.llbb, heap_resize_cx.llbb, stack_no_spill_cx.llbb,
          stack_spill_cx.llbb]);
-    ret res(next_cx, data_ptr);
+    ret tup(len_ptr, data_ptr, next_cx);
 }
 
 fn trans_ivec_append(&@block_ctxt cx, &ty::t t, ValueRef lhs, ValueRef rhs)
@@ -3865,9 +3837,11 @@ fn trans_ivec_append(&@block_ctxt cx, &ty::t t, ValueRef lhs, ValueRef rhs)
     auto rhs_data = rhs_len_and_data._1;
     bcx = rhs_len_and_data._2;
 
-    rslt = reserve_ivec_space(bcx, llunitty, lhs, rhs_len);
-    auto lhs_data = rslt.val;
-    bcx = rslt.bcx;
+    auto lhs_len_ptr_and_data =
+        reserve_ivec_space(bcx, llunitty, lhs, rhs_len);
+    auto lhs_len_ptr = lhs_len_ptr_and_data._0;
+    auto lhs_data = lhs_len_ptr_and_data._1;
+    bcx = lhs_len_ptr_and_data._2;
 
     // Work out the end pointer.
     auto lhs_unscaled_idx = bcx.build.UDiv(rhs_len, llsize_of(llunitty));
@@ -3901,6 +3875,11 @@ fn trans_ivec_append(&@block_ctxt cx, &ty::t t, ValueRef lhs, ValueRef rhs)
         [C_int(1)]), src_ptr);
     post_copy_cx.build.Br(copy_loop_header_cx.llbb);
 
+    // Write in the new length.
+    auto new_len = next_cx.build.Add(next_cx.build.Load(lhs_len_ptr),
+                                     rhs_len);
+    next_cx.build.Store(new_len, lhs_len_ptr);
+
     ret res(next_cx, C_nil());
 }
 
@@ -5857,8 +5836,11 @@ fn trans_ivec(@block_ctxt bcx, &vec[@ast::expr] args, &ast::ann ann)
     auto rslt = size_of(bcx, unit_ty);
     auto unit_sz = rslt.val;
     bcx = rslt.bcx;
+    rslt = align_of(bcx, unit_ty);
+    auto unit_align = rslt.val;
+    bcx = rslt.bcx;
 
-    auto llalen = bcx.build.Mul(unit_sz, C_uint(abi::ivec_default_length));
+    auto llalen = bcx.build.Mul(unit_align, C_uint(abi::ivec_default_length));
 
     auto llunitty = type_of_or_i8(bcx, unit_ty);
     auto llvecptr;
@@ -5903,7 +5885,7 @@ fn trans_ivec(@block_ctxt bcx, &vec[@ast::expr] args, &ast::ann ann)
             llfirsteltptr = C_null(T_ptr(llunitty));
         } else {
             auto llheapsz = bcx.build.Add(llsize_of(llheapty), lllen);
-            rslt = trans_raw_malloc(bcx, T_ptr(llheapty), llheapsz);
+            rslt = trans_raw_malloc(bcx, llheapty, llheapsz);
             bcx = rslt.bcx;
             auto llheapptr = rslt.val;
 
@@ -5926,7 +5908,7 @@ fn trans_ivec(@block_ctxt bcx, &vec[@ast::expr] args, &ast::ann ann)
         auto lleltptr;
         if (ty::type_has_dynamic_size(bcx.fcx.lcx.ccx.tcx, unit_ty)) {
             lleltptr = bcx.build.InBoundsGEP(llfirsteltptr,
-                [bcx.build.Mul(C_uint(i), unit_sz)]);
+                [bcx.build.Mul(C_uint(i), unit_align)]);
         } else {
             lleltptr = bcx.build.InBoundsGEP(llfirsteltptr, [C_uint(i)]);
         }

trunk/src/rt/rust_internal.h

@@ -206,19 +206,27 @@ struct rust_timer {
 
 #include "rust_util.h"
 
+typedef void FASTCALL (glue_fn)(void *, rust_task *, void *,
+                                const type_desc **, void *);
+typedef void FASTCALL (cmp_glue_fn)(void *, rust_task *, void *,
+                                    const type_desc **,
+                                    void *, void *, int8_t);
+
+
 struct type_desc {
     // First part of type_desc is known to compiler.
     // first_param = &descs[1] if dynamic, null if static.
     const type_desc **first_param;
     size_t size;
     size_t align;
-    uintptr_t copy_glue_off;
-    uintptr_t drop_glue_off;
-    uintptr_t free_glue_off;
-    uintptr_t sever_glue_off;    // For GC.
-    uintptr_t mark_glue_off;     // For GC.
-    uintptr_t obj_drop_glue_off; // For custom destructors.
+    glue_fn *take_glue;
+    glue_fn *drop_glue;
+    glue_fn *free_glue;
+    glue_fn *sever_glue;    // For GC.
+    glue_fn *mark_glue;     // For GC.
+    glue_fn *obj_drop_glue; // For custom destructors.
     uintptr_t is_stateful;
+    cmp_glue_fn *cmp_glue;
 
     // Residual fields past here are known only to runtime.
     UT_hash_handle hh;

trunk/src/rt/rust_upcall.cpp

@@ -581,15 +581,8 @@ extern "C" CDECL void
 upcall_ivec_resize(rust_task *task,
                    rust_ivec *v,
                    size_t newsz) {
-    I(task->dom, !v->fill);
-
-    size_t new_alloc = next_power_of_two(newsz);
-    rust_ivec_heap *new_heap_part = (rust_ivec_heap *)
-        task->realloc(v->payload.ptr, new_alloc);
-
-    new_heap_part->fill = newsz;
-    v->alloc = new_alloc;
-    v->payload.ptr = new_heap_part;
+    // TODO
+    task->fail(4);
 }
 
 /**

trunk/src/rt/rust_util.h

@@ -197,8 +197,8 @@ rust_ivec_heap
 union
 rust_ivec_payload
 {
-    rust_ivec_heap *ptr;    // if on heap
-    uint8_t data[];         // if on stack
+    uint8_t data[];                 // if on stack
+    struct rust_ivec_heap *ptr;     // if on heap
 };
 
 struct

trunk/src/snapshots.txt

@@ -1,8 +1,3 @@
-S 2011-06-14 c3015b8
-  linux-i386 b091d33519a1bbf6cf12ee1954a1607940ae3915
-  macos-i386 7d47cece095a7b30f5a3e2467417652d3b2353e5
-  winnt-i386 27d57fd96d2c328d83fcbf7322035019377ab40f
-
 S 2011-06-09 efcf857
   linux-i386 af8e6dba00bdf290768251d55bdda9cba6752e4f
   macos-i386 0c45af8b96effa957906d1d6a2e05bffd627aa51