Skip to content

request at least ptr-size alignment from posix_memalign#62296

Merged
bors merged 4 commits into
rust-lang:masterfrom
RalfJung:memalign
Jul 6, 2019
Merged

request at least ptr-size alignment from posix_memalign#62296
bors merged 4 commits into
rust-lang:masterfrom
RalfJung:memalign

Conversation

@RalfJung

@RalfJung RalfJung commented Jul 2, 2019

Copy link
Copy Markdown
Member

Fixes #62251

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @alexcrichton

(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 Jul 2, 2019
@RalfJung

RalfJung commented Jul 2, 2019

Copy link
Copy Markdown
Member Author

I expanded the check_overalign_request test to actually cover this; it now fails without this patch.

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Jul 2, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 45e7ba9 has been approved by alexcrichton

@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 Jul 2, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 3, 2019
request at least ptr-size alignment from posix_memalign

Fixes rust-lang#62251
@Centril

Centril commented Jul 3, 2019

Copy link
Copy Markdown
Contributor

Failed in #62349 (comment), @bors r-

@bors bors 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 Jul 3, 2019
@RalfJung

RalfJung commented Jul 3, 2019

Copy link
Copy Markdown
Member Author
error‌: unused import: `crate::mem`‌
 ‌--> ‌src/libstd/sys/unix/alloc.rs:4:5‌
  ‌|‌
4‌ ‌| ‌use crate::mem;‌
  ‌| ‌    ‌^^^^^^^^^^‌
  ‌|‌
  ‌= ‌note‌: `-D unused-imports` implied by `-D warnings`‌

(It was actually hard to copy-paste that piece of corrupted output from https://dev.azure.com/rust-lang/rust/_build/results?buildId=2298... impressive, Azure is doing worse than AppVeyor in that regard.)

@RalfJung

RalfJung commented Jul 3, 2019

Copy link
Copy Markdown
Member Author

@alexcrichton This should fix the unused-import error.

@RalfJung RalfJung 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 Jul 4, 2019
@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Jul 4, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 2e47fc3 has been approved by alexcrichton

@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 Jul 4, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 5, 2019
request at least ptr-size alignment from posix_memalign

Fixes rust-lang#62251
Centril added a commit to Centril/rust that referenced this pull request Jul 5, 2019
request at least ptr-size alignment from posix_memalign

Fixes rust-lang#62251
bors added a commit that referenced this pull request Jul 5, 2019
Rollup of 8 pull requests

Successful merges:

 - #60260 (Add support for UWP targets)
 - #62151 (Update linked OpenSSL version)
 - #62245 (Miri engine: support extra function (pointer) values)
 - #62257 (forward read_c_str method from Memory to Alloc)
 - #62264 (Fix perf regression from Miri Machine trait changes)
 - #62296 (request at least ptr-size alignment from posix_memalign)
 - #62329 (Remove support for 1-token lookahead from the lexer)
 - #62377 (Add test for ICE #62375)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Jul 6, 2019
request at least ptr-size alignment from posix_memalign

Fixes rust-lang#62251
bors added a commit that referenced this pull request Jul 6, 2019
Rollup of 7 pull requests

Successful merges:

 - #62151 (Update linked OpenSSL version)
 - #62245 (Miri engine: support extra function (pointer) values)
 - #62257 (forward read_c_str method from Memory to Alloc)
 - #62264 (Fix perf regression from Miri Machine trait changes)
 - #62296 (request at least ptr-size alignment from posix_memalign)
 - #62329 (Remove support for 1-token lookahead from the lexer)
 - #62377 (Add test for ICE #62375)

Failed merges:

r? @ghost
@bors bors merged commit 2e47fc3 into rust-lang:master Jul 6, 2019
@RalfJung RalfJung deleted the memalign branch July 6, 2019 08:05
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.

We call posix_memalign with a too small alignment

5 participants