diff options
| author | bors <bors@rust-lang.org> | 2014-01-15 06:26:38 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-15 06:26:38 -0800 |
| commit | 7bebdbd96826cc70c8e39d025a64b76cd64a2ee7 (patch) | |
| tree | 2a028cf2c91543d8d441624cbf24eb38e2900aa4 /src/libstd/unstable | |
| parent | 180ac0cc07dbd8b4bbd91ed1b3ef8eaca6c87341 (diff) | |
| parent | 7ca3bea5bfd15dd960e6346eebf72422b0020d6b (diff) | |
| download | rust-7bebdbd96826cc70c8e39d025a64b76cd64a2ee7.tar.gz rust-7bebdbd96826cc70c8e39d025a64b76cd64a2ee7.zip | |
auto merge of #11561 : eddyb/rust/moar-inlines, r=pcwalton
Diffstat (limited to 'src/libstd/unstable')
| -rw-r--r-- | src/libstd/unstable/lang.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/unstable/lang.rs b/src/libstd/unstable/lang.rs index e7e8cec9d5f..38c713ad7b7 100644 --- a/src/libstd/unstable/lang.rs +++ b/src/libstd/unstable/lang.rs @@ -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); } |