From 5b40f2ae5b4357a9488bd97da011bd07aebf6aaa Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Sun, 30 Jun 2013 23:30:40 -0400 Subject: pass exchange_malloc an alignment, not a tydesc --- src/libstd/rt/global_heap.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/libstd/rt') diff --git a/src/libstd/rt/global_heap.rs b/src/libstd/rt/global_heap.rs index 1e0ad3352fe..1020580d52c 100644 --- a/src/libstd/rt/global_heap.rs +++ b/src/libstd/rt/global_heap.rs @@ -80,13 +80,8 @@ pub unsafe fn exchange_malloc(td: *c_char, size: uintptr_t) -> *c_char { #[cfg(not(stage0), not(test))] #[lang="exchange_malloc"] #[inline] -pub unsafe fn exchange_malloc(td: *c_char, size: uintptr_t) -> *c_char { - let td = td as *TyDesc; - let size = size as uint; - - assert!(td.is_not_null()); - - let total_size = get_box_size(size, (*td).align); +pub unsafe fn exchange_malloc(align: u32, size: uintptr_t) -> *c_char { + let total_size = get_box_size(size as uint, align as uint); malloc_raw(total_size as uint) as *c_char } -- cgit 1.4.1-3-g733a5