std: include dlmalloc for all non-wasi Wasm targets#153686
Open
Twey wants to merge 2 commits intorust-lang:mainfrom
Open
std: include dlmalloc for all non-wasi Wasm targets#153686Twey wants to merge 2 commits intorust-lang:mainfrom
std: include dlmalloc for all non-wasi Wasm targets#153686Twey wants to merge 2 commits intorust-lang:mainfrom
Conversation
Currently, building std for a custom Wasm target with an OS other than `unknown` will fail, because `sys/alloc/mod.rs` will attempt to use `sys/alloc/wasm.rs`, the dlmalloc-based allocator used on `wasm32-unknown-unknown`. However, currently dlmalloc is only pulled in when `target_os = "unknown"`. Instead, we should make `Cargo.toml` and `alloc/mod.rs` match: either - disable `wasm.rs` in `alloc/mod.rs` where `not(target_os = "unknown")`, or - pull in `dlmalloc` for all Wasm targets with `target_family = "wasm32"` that aren't covered by the [upper branches of `alloc/mod.rs`](https://github.com/rust-lang/rust/blob/main/library/std/src/sys/alloc/mod.rs#L72-L100). This PR takes the latter approach, because it allows more code to compile without a custom allocator.
Collaborator
|
rustbot has assigned @Mark-Simulacrum. Use Why was this reviewer chosen?The reviewer was selected based on:
|
Member
|
|
Author
|
Updated so that it is excluded on |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Currently, building std for a custom Wasm target with an OS other than
unknownwill fail, becausesys/alloc/mod.rswill attempt to usesys/alloc/wasm.rs, the dlmalloc-based allocator used onwasm32-unknown-unknown. However, currently dlmalloc is only pulled in whentarget_os = "unknown".Instead, we should make
Cargo.tomlandalloc/mod.rsmatch: eitherwasm.rsinalloc/mod.rswherenot(target_os = "unknown"), ordlmallocfor all Wasm targets withtarget_family = "wasm32"that aren't covered by the upper branches ofalloc/mod.rs.This PR takes the latter approach, because it allows more code to compile without a custom allocator.