fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-03-28 07:51:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #947 from fitzgen/use-global-allocator-not-system

Browse Source 
Use the global allocator, not the system allocator
This commit is contained in:
Alex Crichton 2018-10-10 08:43:23 -07:00 committed by GitHub
commit 35eeb711ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib.rs
View File

@ -809,7 +809,7 @@ pub mod __rt {
} }
if_std! { if_std! {
use std::alloc::{System, GlobalAlloc, Layout}; use std::alloc::{alloc, dealloc, Layout};
use std::mem; use std::mem;
#[no_mangle] #[no_mangle]
@ -817,7 +817,7 @@ pub mod __rt {
let align = mem::align_of::<usize>(); let align = mem::align_of::<usize>();
if let Ok(layout) = Layout::from_size_align(size, align) { if let Ok(layout) = Layout::from_size_align(size, align) {
unsafe { unsafe {
let ptr = System.alloc(layout); let ptr = alloc(layout);
if !ptr.is_null() { if !ptr.is_null() {
return ptr return ptr
} }
@ -836,7 +836,7 @@ pub mod __rt {
} }
let align = mem::align_of::<usize>(); let align = mem::align_of::<usize>();
let layout = Layout::from_size_align_unchecked(size, align); let layout = Layout::from_size_align_unchecked(size, align);
System.dealloc(ptr, layout); dealloc(ptr, layout);
} }
} }