Skip to content

Upgrade dlmalloc to version 0.2 - #78138

Merged
bors merged 1 commit into
rust-lang:masterfrom
fortanix:raoul/dlmalloc0.2
Nov 17, 2020
Merged

Upgrade dlmalloc to version 0.2#78138
bors merged 1 commit into
rust-lang:masterfrom
fortanix:raoul/dlmalloc0.2

Conversation

@raoulstrackx

@raoulstrackxraoulstrackx commented Oct 20, 2020

Copy link
Copy Markdown
Contributor

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 alexcrichton/dlmalloc-rs#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

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @shepmaster

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 20, 2020
Comment threadlibrary/std/src/sys/sgx/abi/mem.rs Outdated
@raoulstrackx

Copy link
Copy Markdown
ContributorAuthor

Blocked by alexcrichton/dlmalloc-rs#15

@raoulstrackx

Copy link
Copy Markdown
ContributorAuthor

Could this get a review please?

@jethrogbjethrogb left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Nov 10, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 26f0f12 has been approved by Mark-Simulacrum

@borsbors 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 Nov 10, 2020
This was referenced Nov 11, 2020
@jonas-schievink

Copy link
Copy Markdown
Contributor

@bors r- rollup=iffy failed in #78954 (comment)

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 11, 2020
@raoulstrackx

Copy link
Copy Markdown
ContributorAuthor

@Mark-Simulacrum I've fixed support for Wasm. Could you review the PR again? Thanks!

@Mark-SimulacrumMark-Simulacrum added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 13, 2020
@shepmaster

Copy link
Copy Markdown
Member

r? @Mark-Simulacrum

@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Nov 17, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 292f15c has been approved by Mark-Simulacrum

@borsbors 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 Nov 17, 2020
@m-ou-sem-ou-se mentioned this pull request Nov 17, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 17, 2020
Rollup of 9 pull requests
Successful merges:
- rust-lang#77939 (Ensure that the source code display is working with DOS backline)
- rust-lang#78138 (Upgrade dlmalloc to version 0.2)
- rust-lang#78967 (Make codegen tests compatible with extra inlining)
- rust-lang#79027 (Limit storage duration of inlined always live locals)
- rust-lang#79077 (document that __rust_alloc is also magic to our LLVM fork)
- rust-lang#79088 (clarify `span_label` documentation)
- rust-lang#79097 (Code block invalid html tag lint)
- rust-lang#79105 (std: Fix test `symlink_hard_link` on Windows)
- rust-lang#79107 (build-manifest: strip newline from rustc version)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit d6da525 into rust-lang:masterNov 17, 2020
@rustbotrustbot added this to the 1.50.0 milestone Nov 17, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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.

8 participants

@raoulstrackx@rust-highfive@Mark-Simulacrum@bors@jonas-schievink@shepmaster@jethrogb@rustbot