fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-04-01 01:41:08 +00:00
Code Issues Projects Releases Wiki Activity

Use the global allocator, not the system allocator

Browse Source 
This was previously causing us to accidentally always pull in the system
allocator, even if users were trying to just use a custom global allocator.
This commit is contained in:
Nick Fitzgerald 2018-10-09 18:08:46 -07:00
parent d70149dd91
commit 3ceb0441d3
1 changed files with 3 additions and 3 deletions

6
src/lib.rs

@ -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);
} }
} }