diff options
| author | Mara Bos <m-ou.se@m-ou.se> | 2020-11-17 10:06:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-17 10:06:16 +0100 |
| commit | d6da5254a0cc6e896685fa32e2a4c0979933dda5 (patch) | |
| tree | 85023e074c26bc6e9c8197755b18524050cc5dbb /library/std/src/sys/wasm/alloc.rs | |
| parent | cf349567e44a704a496af3933054ae554e529b18 (diff) | |
| parent | 292f15ce87b52a8dd4cfbeca8c050004fdec2358 (diff) | |
| download | rust-d6da5254a0cc6e896685fa32e2a4c0979933dda5.tar.gz rust-d6da5254a0cc6e896685fa32e2a4c0979933dda5.zip | |
Rollup merge of #78138 - fortanix:raoul/dlmalloc0.2, r=Mark-Simulacrum
Upgrade dlmalloc to version 0.2 In preparation of adding dynamic memory management support for SGXv2-enabled platforms, the dlmalloc crate has been refactored. More specifically, support has been added to implement platform specification outside of the dlmalloc crate. (see https://github.com/alexcrichton/dlmalloc-rs/pull/15) This PR upgrades dlmalloc to version 0.2 for the `wasm` and `sgx` targets. As the dlmalloc changes have received a positive review, but have not been merged yet, this PR contains a commit to prevent tidy from aborting CI prematurely. cc: `@jethrogb`
Diffstat (limited to 'library/std/src/sys/wasm/alloc.rs')
| -rw-r--r-- | library/std/src/sys/wasm/alloc.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/sys/wasm/alloc.rs b/library/std/src/sys/wasm/alloc.rs index b61a7872265..ef0ca3dd478 100644 --- a/library/std/src/sys/wasm/alloc.rs +++ b/library/std/src/sys/wasm/alloc.rs @@ -18,7 +18,7 @@ use crate::alloc::{GlobalAlloc, Layout, System}; -static mut DLMALLOC: dlmalloc::Dlmalloc = dlmalloc::DLMALLOC_INIT; +static mut DLMALLOC: dlmalloc::Dlmalloc = dlmalloc::Dlmalloc::new(); #[stable(feature = "alloc_system_type", since = "1.28.0")] unsafe impl GlobalAlloc for System { |