Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

std: Synchronize global allocator on wasm32 #54950

Merged
merged 1 commit into from
Oct 12, 2018

Conversation

alexcrichton
Copy link
Member

We originally didn't have threads, and now we're starting to add them!
Make sure we properly synchronize access to dlmalloc when the atomics
feature is enabled for wasm32-unknown-unknown.

@rust-highfive
Copy link
Collaborator

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 10, 2018
@alexcrichton
Copy link
Member Author

r? @sfackler

@rust-highfive rust-highfive assigned sfackler and unassigned aturon Oct 10, 2018
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-5.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
[00:04:25]    Compiling rustc_asan v0.0.0 (/checkout/src/librustc_asan)
[00:04:39]    Compiling libc v0.0.0 (/checkout/src/rustc/libc_shim)
[00:04:39]    Compiling alloc v0.0.0 (/checkout/src/liballoc)
[00:04:40]    Compiling alloc_system v0.0.0 (/checkout/src/liballoc_system)
[00:04:40] error: expected `)`, found `,`
[00:04:40]   --> liballoc_system/lib.rs:25:38
[00:04:40]    |
[00:04:40] 25 |     feature(integer_atomics, stdsimd),
[00:04:40]    |                                      ^ expected `)`
[00:04:40] error: aborting due to previous error
[00:04:40] 
[00:04:40] error: Could not compile `alloc_system`.
[00:04:40] warning: build failed, waiting for other jobs to finish...
---
151492 ./obj/build/bootstrap/debug/incremental
151412 ./src/tools/clang
149116 ./src/llvm-emscripten/test
136028 ./obj/build/bootstrap/debug/incremental/bootstrap-3ivyub3ic2113
136024 ./obj/build/bootstrap/debug/incremental/bootstrap-3ivyub3ic2113/s-f5l0vkwrpx-xl25bp-374dpar6w80ak
107652 ./obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends
104700 ./src/tools/lldb
93748 ./src/tools/clang/test
73656 ./obj/build/x86_64-unknown-linux-gnu/stage0-std

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

We originally didn't have threads, and now we're starting to add them!
Make sure we properly synchronize access to dlmalloc when the `atomics`
feature is enabled for `wasm32-unknown-unknown`.
@sfackler
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Oct 10, 2018

📌 Commit c1f7e92 has been approved by sfackler

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 10, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Oct 12, 2018
…=sfackler

std: Synchronize global allocator on wasm32

We originally didn't have threads, and now we're starting to add them!
Make sure we properly synchronize access to dlmalloc when the `atomics`
feature is enabled for `wasm32-unknown-unknown`.
bors added a commit that referenced this pull request Oct 12, 2018
Rollup of 16 pull requests

Successful merges:

 - #54755 (Documents reference equality by address (#54197))
 - #54811 (During rustc bootstrap, make default for `optimize` independent of `debug`)
 - #54825 (NLL says "borrowed content" instead of more precise "dereference of raw pointer")
 - #54860 (Add doc comments about safest way to initialize a vector of zeros)
 - #54869 (Fix mobile docs)
 - #54891 (Fix tracking issue for Once::is_completed)
 - #54913 (doc fix: it's auto traits that make for automatic implementations)
 - #54920 (Fix handling of #[must_use] on unit and uninhabited types)
 - #54932 (A handful of random string-related improvements)
 - #54936 (impl Eq+Hash for TyLayout)
 - #54950 (std: Synchronize global allocator on wasm32)
 - #54956 ("(using ..." doesn't have the matching ")")
 - #54958 (add a macro for static (compile-time) assertions)
 - #54967 (Remove incorrect span for second label inner macro invocation)
 - #54983 (Fix slice's benchmarks)
 - #54989 (Fix spelling in the documentation to htmldocck.py)

Failed merges:

r? @ghost
@bors bors merged commit c1f7e92 into rust-lang:master Oct 12, 2018
@alexcrichton alexcrichton deleted the wasm-sync-allocator branch October 21, 2018 01:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants