Fork the jemallocator crate, fix for nightly-2018-04-15 #20641
Merged
Conversation
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
Eijebong
reviewed
Apr 15, 2018
Cargo.lock
Outdated
|
|
||
| [[package]] | ||
| name = "libc" | ||
| version = "0.1.12" |
Contributor
There was a problem hiding this comment.
Uh ? Could we avoid that duplication ?
highfive
added
the
S-awaiting-review
SimonSapin
force-pushed
the
alloc
branch
2 times, most recently
from
2ea085f to
179e0d6
Compare
CC https://github.com/alexcrichton/jemallocator/pull/40, rust-lang/rust#49669 The new version of jemallocator requires a more recent jemalloc https://github.com/alexcrichton/jemallocator/pull/34 which doesn’t build on our current Android toolchain jemalloc/jemalloc#1175. To avoid blocking on figuring that out, duplicate ~70 lines from jemallocator and use the older jemalloc-sys directly.
Contributor
|
@bors-servo r+ |
Contributor
|
📌 Commit 7dbc524 has been approved by |
highfive
added
S-awaiting-merge
Contributor
bors-servo
pushed a commit
that referenced
this pull request
Apr 16, 2018
Fork the jemallocator crate, fix for nightly-2018-04-15 CC https://github.com/alexcrichton/jemallocator/pull/40, rust-lang/rust#49669 The new version of jemallocator requires a more recent jemalloc https://github.com/alexcrichton/jemallocator/pull/34 which doesn’t build on our current Android toolchain jemalloc/jemalloc#1175. To avoid blocking on figuring that out, duplicate ~70 lines from jemallocator and use the older jemalloc-sys directly. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20641) <!-- Reviewable:end -->
emilio
reviewed
Apr 16, 2018
| pub use super::ffi::{malloc, realloc, free}; | ||
| } | ||
|
|
||
| pub struct Allocator; |
Member
There was a problem hiding this comment.
Could we get an issue on file to undo this?
Contributor
|
☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev |
highfive
removed
the
S-awaiting-merge
4 tasks
mrobinson
added a commit
to mrobinson/servo
that referenced
this pull request
Jan 1, 2024
This dependency was forked in #servo#20641 in order to fix the Android build. Years have gone by and it's quite likely that many things have changed in the Android toolchain and these dependencies. We can sort out this issue when getting the Android build working -- or if all else fails, disable jemalloc for Android. In the meantime, unfork the dependency and upgrade it. Fixes servo#20645.
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jan 1, 2024
This dependency was forked in ##20641 in order to fix the Android build. Years have gone by and it's quite likely that many things have changed in the Android toolchain and these dependencies. We can sort out this issue when getting the Android build working -- or if all else fails, disable jemalloc for Android. In the meantime, unfork the dependency and upgrade it. Fixes #20645.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
CC https://github.com/alexcrichton/jemallocator/pull/40, rust-lang/rust#49669
The new version of jemallocator requires a more recent jemalloc https://github.com/alexcrichton/jemallocator/pull/34 which doesn’t build on our current Android toolchain jemalloc/jemalloc#1175.
To avoid blocking on figuring that out, duplicate ~70 lines from jemallocator and use the older jemalloc-sys directly.
This change is