Skip to content

Commit

Permalink
Register new snapshots
Browse files Browse the repository at this point in the history
This is the first linux snapshot created on our new CentOS 5.10 builders.

Closes rust-lang#9545
  • Loading branch information
alexcrichton committed Sep 17, 2014
1 parent 0e784e1 commit c4a1c38
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 36 deletions.
29 changes: 0 additions & 29 deletions src/liballoc/heap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@

// FIXME: #13996: mark the `allocate` and `reallocate` return value as `noalias`

#[cfg(stage0, not(test))] use core::raw;
#[cfg(stage0, not(test))] use util;

/// Returns a pointer to `size` bytes of memory.
///
/// Behavior is undefined if the requested size is 0 or the alignment is not a
Expand Down Expand Up @@ -111,21 +108,6 @@ unsafe fn exchange_free(ptr: *mut u8, size: uint, align: uint) {
deallocate(ptr, size, align);
}

#[cfg(stage0, not(test))]
#[lang="closure_exchange_malloc"]
#[inline]
#[allow(deprecated)]
unsafe fn closure_exchange_malloc(drop_glue: fn(*mut u8), size: uint,
align: uint) -> *mut u8 {
let total_size = util::get_box_size(size, align);
let p = allocate(total_size, 8);

let alloc = p as *mut raw::Box<()>;
(*alloc).drop_glue = drop_glue;

alloc as *mut u8
}

// The minimum alignment guaranteed by the architecture. This value is used to
// add fast paths for low alignment values. In practice, the alignment is a
// constant at the call site and the branch will be optimized out.
Expand Down Expand Up @@ -155,9 +137,6 @@ mod imp {
flags: c_int) -> *mut c_void;
fn je_xallocx(ptr: *mut c_void, size: size_t, extra: size_t,
flags: c_int) -> size_t;
#[cfg(stage0)]
fn je_dallocx(ptr: *mut c_void, flags: c_int);
#[cfg(not(stage0))]
fn je_sdallocx(ptr: *mut c_void, size: size_t, flags: c_int);
fn je_nallocx(size: size_t, flags: c_int) -> size_t;
fn je_malloc_stats_print(write_cb: Option<extern "C" fn(cbopaque: *mut c_void,
Expand Down Expand Up @@ -209,14 +188,6 @@ mod imp {
}

#[inline]
#[cfg(stage0)]
pub unsafe fn deallocate(ptr: *mut u8, _size: uint, align: uint) {
let flags = align_to_flags(align);
je_dallocx(ptr as *mut c_void, flags)
}

#[inline]
#[cfg(not(stage0))]
pub unsafe fn deallocate(ptr: *mut u8, size: uint, align: uint) {
let flags = align_to_flags(align);
je_sdallocx(ptr as *mut c_void, size as size_t, flags)
Expand Down
7 changes: 0 additions & 7 deletions src/libcore/fmt/rt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,6 @@
//! These definitions are similar to their `ct` equivalents, but differ in that
//! these can be statically allocated and are slightly optimized for the runtime

#[cfg(stage0)]
#[doc(hidden)]
pub enum Piece<'a> {
String(&'a str),
Argument(Argument<'a>),
}

#[doc(hidden)]
pub struct Argument<'a> {
pub position: Position,
Expand Down
9 changes: 9 additions & 0 deletions src/snapshots.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
S 2014-09-16 828e075
winnt-x86_64 ce1e9d7f6967bfa368853e7c968e1626cc319951
winnt-i386 a8bd994666dfe683a5d7922c7998500255780724
linux-x86_64 88ff474db96c6ffc5c1dc7a43442cbe1cd88c8a2
linux-i386 7a731891f726c8a0590b142a4e8924c5e8b22e8d
freebsd-x86_64 e67a56f76484f775cd4836dedb2d1069ab5d7921
macos-i386 f48023648a77e89086f4a2b39d76b09e4fff032d
macos-x86_64 2ad6457b2b3036f87eae7581d64ee5341a07fb06

S 2014-09-10 6faa4f3
winnt-x86_64 939eb546469cb936441cff3b6f2478f562f77c46
winnt-i386 cfe4f8b519bb9d62588f9310a8f94bc919d5423b
Expand Down

1 comment on commit c4a1c38

@brson
Copy link

@brson brson commented on c4a1c38 Sep 17, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r+

Please sign in to comment.