user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto merge of #11561 : eddyb/rust/moar-inlines, r=pcwalton

Browse source
This commit is contained in:
bors 2014-01-15 06:26:38 -08:00
commit 7bebdbd968
8 changed files with 36 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstd/unstable/lang.rs
View file

@ -29,6 +29,7 @@ pub fn fail_bounds_check(file: *c_char, line: size_t, index: size_t, len: size_t
}
#[lang="malloc"]
#[inline]
pub unsafe fn local_malloc(td: *c_char, size: uintptr_t) -> *c_char {
::rt::local_heap::local_malloc(td, size)
}
@ -37,6 +38,7 @@ pub unsafe fn local_malloc(td: *c_char, size: uintptr_t) -> *c_char {
// inside a landing pad may corrupt the state of the exception handler. If a
// problem occurs, call exit instead.
#[lang="free"]
#[inline]
pub unsafe fn local_free(ptr: *c_char) {
::rt::local_heap::local_free(ptr);
}