---

yaml
---
r: 63587
b: refs/heads/snap-stage3
c: 2b581c1
h: refs/heads/master
i:
  63585: 887b62c
  63583: 7da8596
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: e2f1049bd5f041f1f219d683e4e29e32ca30cd1c
+refs/heads/snap-stage3: 2b581c17b56eb8cff8a2048519846d1abfb726bd
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libextra/arena.rs

@@ -41,21 +41,30 @@ use list::{MutList, MutCons, MutNil};
 use core::at_vec;
 use core::cast::{transmute, transmute_mut_region};
 use core::cast;
+use core::libc::size_t;
 use core::ptr;
+use core::sys::TypeDesc;
 use core::sys;
 use core::uint;
 use core::vec;
 use core::unstable::intrinsics;
-use core::unstable::intrinsics::{TyDesc};
 
-#[cfg(not(stage0))]
-use core::unstable::intrinsics::{get_tydesc};
+pub mod rustrt {
+    use core::libc::size_t;
+    use core::sys::TypeDesc;
 
-#[cfg(stage0)]
-unsafe fn get_tydesc<T>() -> *TyDesc {
-    intrinsics::get_tydesc::<T>() as *TyDesc
+    pub extern {
+        #[rust_stack]
+        unsafe fn rust_call_tydesc_glue(root: *u8,
+                                        tydesc: *TypeDesc,
+                                        field: size_t);
+    }
 }
 
+// This probably belongs somewhere else. Needs to be kept in sync with
+// changes to glue...
+static tydesc_drop_glue_index: size_t = 3 as size_t;
+
 // The way arena uses arrays is really deeply awful. The arrays are
 // allocated, and have capacities reserved, but the fill for the array
 // will always stay at 0.
@@ -115,19 +124,6 @@ fn round_up_to(base: uint, align: uint) -> uint {
     (base + (align - 1)) & !(align - 1)
 }
 
-#[inline]
-#[cfg(not(stage0))]
-unsafe fn call_drop_glue(tydesc: *TyDesc, data: *i8) {
-    // This function should be inlined when stage0 is gone
-    ((*tydesc).drop_glue)(data);
-}
-
-#[inline]
-#[cfg(stage0)]
-unsafe fn call_drop_glue(tydesc: *TyDesc, data: *i8) {
-    ((*tydesc).drop_glue)(0 as **TyDesc, data);
-}
-
 // Walk down a chunk, running the destructors for any objects stored
 // in it.
 unsafe fn destroy_chunk(chunk: &Chunk) {
@@ -140,18 +136,19 @@ unsafe fn destroy_chunk(chunk: &Chunk) {
         let (tydesc, is_done) = un_bitpack_tydesc_ptr(*tydesc_data);
         let (size, align) = ((*tydesc).size, (*tydesc).align);
 
-        let after_tydesc = idx + sys::size_of::<*TyDesc>();
+        let after_tydesc = idx + sys::size_of::<*TypeDesc>();
 
         let start = round_up_to(after_tydesc, align);
 
         //debug!("freeing object: idx = %u, size = %u, align = %u, done = %b",
         //       start, size, align, is_done);
         if is_done {
-            call_drop_glue(tydesc, ptr::offset(buf, start) as *i8);
+            rustrt::rust_call_tydesc_glue(
+                ptr::offset(buf, start), tydesc, tydesc_drop_glue_index);
         }
 
         // Find where the next tydesc lives
-        idx = round_up_to(start + size, sys::pref_align_of::<*TyDesc>());
+        idx = round_up_to(start + size, sys::pref_align_of::<*TypeDesc>());
     }
 }
 
@@ -160,12 +157,12 @@ unsafe fn destroy_chunk(chunk: &Chunk) {
 // is necessary in order to properly do cleanup if a failure occurs
 // during an initializer.
 #[inline]
-unsafe fn bitpack_tydesc_ptr(p: *TyDesc, is_done: bool) -> uint {
+unsafe fn bitpack_tydesc_ptr(p: *TypeDesc, is_done: bool) -> uint {
     let p_bits: uint = transmute(p);
     p_bits | (is_done as uint)
 }
 #[inline]
-unsafe fn un_bitpack_tydesc_ptr(p: uint) -> (*TyDesc, bool) {
+unsafe fn un_bitpack_tydesc_ptr(p: uint) -> (*TypeDesc, bool) {
     (transmute(p & !1), p & 1 == 1)
 }
 
@@ -205,7 +202,7 @@ impl Arena {
     #[inline]
     fn alloc_pod<'a, T>(&'a mut self, op: &fn() -> T) -> &'a T {
         unsafe {
-            let tydesc = get_tydesc::<T>();
+            let tydesc = sys::get_type_desc::<T>();
             let ptr = self.alloc_pod_inner((*tydesc).size, (*tydesc).align);
             let ptr: *mut T = transmute(ptr);
             intrinsics::move_val_init(&mut (*ptr), op());
@@ -233,13 +230,13 @@ impl Arena {
             let head = transmute_mut_region(&mut self.head);
 
             let tydesc_start = head.fill;
-            let after_tydesc = head.fill + sys::size_of::<*TyDesc>();
+            let after_tydesc = head.fill + sys::size_of::<*TypeDesc>();
             let start = round_up_to(after_tydesc, align);
             let end = start + n_bytes;
             if end > at_vec::capacity(head.data) {
                 return self.alloc_nonpod_grow(n_bytes, align);
             }
-            head.fill = round_up_to(end, sys::pref_align_of::<*TyDesc>());
+            head.fill = round_up_to(end, sys::pref_align_of::<*TypeDesc>());
 
             //debug!("idx = %u, size = %u, align = %u, fill = %u",
             //       start, n_bytes, align, head.fill);
@@ -252,7 +249,7 @@ impl Arena {
     #[inline]
     fn alloc_nonpod<'a, T>(&'a mut self, op: &fn() -> T) -> &'a T {
         unsafe {
-            let tydesc = get_tydesc::<T>();
+            let tydesc = sys::get_type_desc::<T>();
             let (ty_ptr, ptr) =
                 self.alloc_nonpod_inner((*tydesc).size, (*tydesc).align);
             let ty_ptr: *mut uint = transmute(ty_ptr);

branches/snap-stage3/src/libextra/dbg.rs

@@ -13,62 +13,56 @@
 #[allow(missing_doc)];
 
 use core::cast::transmute;
-#[cfg(stage0)]
-use intrinsic::{get_tydesc};
-#[cfg(not(stage0))]
-use core::unstable::intrinsics::{get_tydesc};
+use core::sys;
 
 pub mod rustrt {
-    #[cfg(stage0)]
-    use intrinsic::{TyDesc};
-    #[cfg(not(stage0))]
-    use core::unstable::intrinsics::{TyDesc};
+    use core::sys;
 
     #[abi = "cdecl"]
     pub extern {
-        pub unsafe fn debug_tydesc(td: *TyDesc);
-        pub unsafe fn debug_opaque(td: *TyDesc, x: *());
-        pub unsafe fn debug_box(td: *TyDesc, x: *());
-        pub unsafe fn debug_tag(td: *TyDesc, x: *());
-        pub unsafe fn debug_fn(td: *TyDesc, x: *());
-        pub unsafe fn debug_ptrcast(td: *TyDesc, x: *()) -> *();
+        pub unsafe fn debug_tydesc(td: *sys::TypeDesc);
+        pub unsafe fn debug_opaque(td: *sys::TypeDesc, x: *());
+        pub unsafe fn debug_box(td: *sys::TypeDesc, x: *());
+        pub unsafe fn debug_tag(td: *sys::TypeDesc, x: *());
+        pub unsafe fn debug_fn(td: *sys::TypeDesc, x: *());
+        pub unsafe fn debug_ptrcast(td: *sys::TypeDesc, x: *()) -> *();
         pub unsafe fn rust_dbg_breakpoint();
     }
 }
 
 pub fn debug_tydesc<T>() {
     unsafe {
-        rustrt::debug_tydesc(get_tydesc::<T>());
+        rustrt::debug_tydesc(sys::get_type_desc::<T>());
     }
 }
 
 pub fn debug_opaque<T>(x: T) {
     unsafe {
-        rustrt::debug_opaque(get_tydesc::<T>(), transmute(&x));
+        rustrt::debug_opaque(sys::get_type_desc::<T>(), transmute(&x));
     }
 }
 
 pub fn debug_box<T>(x: @T) {
     unsafe {
-        rustrt::debug_box(get_tydesc::<T>(), transmute(&x));
+        rustrt::debug_box(sys::get_type_desc::<T>(), transmute(&x));
     }
 }
 
 pub fn debug_tag<T>(x: T) {
     unsafe {
-        rustrt::debug_tag(get_tydesc::<T>(), transmute(&x));
+        rustrt::debug_tag(sys::get_type_desc::<T>(), transmute(&x));
     }
 }
 
 pub fn debug_fn<T>(x: T) {
     unsafe {
-        rustrt::debug_fn(get_tydesc::<T>(), transmute(&x));
+        rustrt::debug_fn(sys::get_type_desc::<T>(), transmute(&x));
     }
 }
 
 pub unsafe fn ptr_cast<T, U>(x: @T) -> @U {
     transmute(
-        rustrt::debug_ptrcast(get_tydesc::<T>(), transmute(x)))
+        rustrt::debug_ptrcast(sys::get_type_desc::<T>(), transmute(x)))
 }
 
 /// Triggers a debugger breakpoint

branches/snap-stage3/src/libextra/time.rs

@@ -1142,6 +1142,9 @@ mod tests {
         assert!(result::unwrap(strptime("-0800", "%z")).tm_gmtoff ==
             0);
         assert!(test("%", "%%"));
+
+        // Test for #7256
+        assert_eq!(strptime("360", "%Y-%m-%d"), Err(~"Invalid year"))
     }
 
     fn test_ctime() {

branches/snap-stage3/src/librustc/back/abi.rs

@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+
+
+
 pub static rc_base_field_refcnt: uint = 0u;
 
 pub static task_field_refcnt: uint = 0u;
@@ -46,7 +49,9 @@ pub static tydesc_field_take_glue: uint = 2u;
 pub static tydesc_field_drop_glue: uint = 3u;
 pub static tydesc_field_free_glue: uint = 4u;
 pub static tydesc_field_visit_glue: uint = 5u;
-pub static n_tydesc_fields: uint = 6u;
+pub static tydesc_field_shape: uint = 6u;
+pub static tydesc_field_shape_tables: uint = 7u;
+pub static n_tydesc_fields: uint = 8u;
 
 // The two halves of a closure: code and environment.
 pub static fn_field_code: uint = 0u;
@@ -66,4 +71,14 @@ pub static vec_elt_elems: uint = 2u;
 pub static slice_elt_base: uint = 0u;
 pub static slice_elt_len: uint = 1u;
 
+pub static worst_case_glue_call_args: uint = 7u;
+
 pub static abi_version: uint = 1u;
+
+pub fn memcpy_glue_name() -> ~str { return ~"rust_memcpy_glue"; }
+
+pub fn bzero_glue_name() -> ~str { return ~"rust_bzero_glue"; }
+
+pub fn yield_glue_name() -> ~str { return ~"rust_yield_glue"; }
+
+pub fn no_op_type_glue_name() -> ~str { return ~"rust_no_op_type_glue"; }

branches/snap-stage3/src/librustc/driver/driver.rs

@@ -206,6 +206,9 @@ pub fn compile_rest(sess: Session,
     let mut crate = crate_opt.unwrap();
 
     let (llcx, llmod, link_meta) = {
+    crate = time(time_passes, ~"intrinsic injection", ||
+                 front::intrinsic_inject::inject_intrinsic(sess, crate));
+
         crate = time(time_passes, ~"extra injection", ||
                      front::std_inject::maybe_inject_libstd_ref(sess, crate));