---

yaml
---
r: 21839
b: refs/heads/snap-stage3
c: aa2ab26
h: refs/heads/master
i:
  21837: 93e7b04
  21835: d6797ee
  21831: 8dfb010
  21823: 4adf690
v: v3

Author: graydon

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 1c5db46f8e44441ba1aa11f0f607b7c015fd1fa5
+refs/heads/snap-stage3: aa2ab2659f6c7aca79ddaaac5370da8aea6a18d6
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/at_vec.rs

@@ -30,7 +30,7 @@ pure fn capacity<T>(&&v: @[const T]) -> uint {
     unsafe {
         let repr: **unsafe::VecRepr =
             ::unsafe::reinterpret_cast(&addr_of(v));
-        (**repr).alloc / sys::size_of::<T>()
+        (**repr).unboxed.alloc / sys::size_of::<T>()
     }
 }
 
@@ -155,14 +155,14 @@ mod unsafe {
     #[inline(always)]
     unsafe fn set_len<T>(&&v: @[const T], new_len: uint) {
         let repr: **VecRepr = ::unsafe::reinterpret_cast(&addr_of(v));
-        (**repr).fill = new_len * sys::size_of::<T>();
+        (**repr).unboxed.fill = new_len * sys::size_of::<T>();
     }
 
     #[inline(always)]
     unsafe fn push<T>(&v: @[const T], +initval: T) {
         let repr: **VecRepr = ::unsafe::reinterpret_cast(&addr_of(v));
-        let fill = (**repr).fill;
-        if (**repr).alloc > fill {
+        let fill = (**repr).unboxed.fill;
+        if (**repr).unboxed.alloc > fill {
             push_fast(v, move initval);
         }
         else {
@@ -173,9 +173,9 @@ mod unsafe {
     #[inline(always)] // really pretty please
     unsafe fn push_fast<T>(&v: @[const T], +initval: T) {
         let repr: **VecRepr = ::unsafe::reinterpret_cast(&addr_of(v));
-        let fill = (**repr).fill;
-        (**repr).fill += sys::size_of::<T>();
-        let p = ptr::addr_of((**repr).data);
+        let fill = (**repr).unboxed.fill;
+        (**repr).unboxed.fill += sys::size_of::<T>();
+        let p = ptr::addr_of((**repr).unboxed.data);
         let p = ptr::offset(p, fill) as *mut T;
         rusti::move_val_init(*p, move initval);
     }

branches/snap-stage3/src/libcore/box.rs

@@ -5,8 +5,25 @@
 #[forbid(deprecated_pattern)];
 
 use cmp::{Eq, Ord};
+use intrinsic::TyDesc;
 
-export ptr_eq;
+export ptr_eq, raw;
+
+mod raw {
+
+    struct BoxHeaderRepr {
+        ref_count: uint,
+        type_desc: *TyDesc,
+        prev: *BoxRepr,
+        next: *BoxRepr,
+    }
+
+    struct BoxRepr {
+        header: BoxHeaderRepr,
+        data: u8
+    }
+
+}
 
 pure fn ptr_eq<T>(a: @T, b: @T) -> bool {
     //! Determine if two shared boxes point to the same object

branches/snap-stage3/src/libcore/cleanup.rs

@@ -80,28 +80,28 @@ pub unsafe fn annihilate() {
     let mut box: *mut BoxRepr = transmute(copy box);
     while box != mut_null() {
         debug!("making box immortal: %x", box as uint);
-        (*box).ref_count = 0x77777777;
-        box = transmute(copy (*box).next);
+        (*box).header.ref_count = 0x77777777;
+        box = transmute(copy (*box).header.next);
     }
 
     // Pass 2: Drop all boxes.
     let box = (*task).boxed_region.live_allocs;
     let mut box: *mut BoxRepr = transmute(copy box);
     while box != mut_null() {
         debug!("calling drop glue for box: %x", box as uint);
-        let tydesc: *TypeDesc = transmute(copy (*box).type_desc);
+        let tydesc: *TypeDesc = transmute(copy (*box).header.type_desc);
         let drop_glue: DropGlue = transmute(((*tydesc).drop_glue, 0));
         drop_glue(to_unsafe_ptr(&tydesc), transmute(&(*box).data));
 
-        box = transmute(copy (*box).next);
+        box = transmute(copy (*box).header.next);
     }
 
     // Pass 3: Free all boxes.
     loop {
         let box = (*task).boxed_region.live_allocs;
         if box == null() { break; }
         let mut box: *mut BoxRepr = transmute(copy box);
-        assert (*box).prev == null();
+        assert (*box).header.prev == null();
 
         debug!("freeing box: %x", box as uint);
         rt_free(transmute(box));

branches/snap-stage3/src/libcore/core.rc

@@ -63,6 +63,7 @@ export unit;
 export uniq;
 export repr;
 export cleanup;
+export reflect;
 
 // NDM seems to be necessary for resolve to work
 export option_iter;
@@ -230,6 +231,7 @@ mod mutable;
 mod flate;
 mod repr;
 mod cleanup;
+mod reflect;
 
 // Modules supporting compiler-generated code
 // Exported but not part of the public interface