Overhaul of the `AllocRef` trait to match allocator-wg's latest consens; Take 2#70362

TimDiekmann · 2020-03-24T17:25:55Z

GitHub won't let me reopen #69889 so I make a new PR.

In addition to #69889 this fixes the unsoundness of RawVec::into_box when using allocators supporting overallocating. Also it uses MemoryBlock in AllocRef to unify _in_place methods by passing &mut MemoryBlock. Additionally, RawVec now checks for size_of::<T>() again and ignore every ZST. The internal capacity of RawVec isn't used by ZSTs anymore, as into_box now requires a length to be specified.

r? @Amanieu

fixes rust-lang/wg-allocators#38
fixes rust-lang/wg-allocators#41
fixes rust-lang/wg-allocators#44
fixes rust-lang/wg-allocators#51

src/libcore/alloc/mod.rs

src/libstd/alloc.rs

src/liballoc/raw_vec.rs

rust-highfive · 2020-03-25T17:52:20Z

The job mingw-check of your PR failed (pretty log, 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.

2020-03-25T17:46:43.0878218Z ========================== Starting Command Output ===========================
2020-03-25T17:46:43.0880806Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/a71544a1-7773-4ac5-8442-fe2d5d50f91b.sh
2020-03-25T17:46:43.0881066Z 
2020-03-25T17:46:43.0885272Z ##[section]Finishing: Disable git automatic line ending conversion
2020-03-25T17:46:43.0904290Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/70362/merge to s
2020-03-25T17:46:43.0907500Z Task         : Get sources
2020-03-25T17:46:43.0907792Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-25T17:46:43.0908074Z Version      : 1.0.0
2020-03-25T17:46:43.0908264Z Author       : Microsoft
---
2020-03-25T17:46:44.3634866Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-03-25T17:46:44.3647773Z ##[command]git config gc.auto 0
2020-03-25T17:46:44.3669255Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-03-25T17:46:44.3678330Z ##[command]git config --get-all http.proxy
2020-03-25T17:46:44.3693177Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/70362/merge:refs/remotes/pull/70362/merge
---
2020-03-25T17:48:57.1223541Z  ---> 3fc1b512c57b
2020-03-25T17:48:57.1223755Z Step 6/7 : ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
2020-03-25T17:48:57.1224122Z  ---> Using cache
2020-03-25T17:48:57.1224427Z  ---> 5ee4295733f4
2020-03-25T17:48:57.1225892Z Step 7/7 : ENV SCRIPT python2.7 ../x.py test src/tools/expand-yaml-anchors &&            python2.7 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu &&            python2.7 ../x.py build --stage 0 src/tools/build-manifest &&            python2.7 ../x.py test --stage 0 src/tools/compiletest &&            python2.7 ../x.py test src/tools/tidy &&            /scripts/validate-toolstate.sh
2020-03-25T17:48:57.1227238Z  ---> 3d07a0fa42fe
2020-03-25T17:48:57.1276824Z Successfully built 3d07a0fa42fe
2020-03-25T17:48:57.1302363Z Successfully tagged rust-ci:latest
2020-03-25T17:48:57.1591319Z Built container sha256:3d07a0fa42feb5754fc13bb2f7010ebe13e4b8b8cdbebed0c75d8da320c8c8ad
---
2020-03-25T17:50:59.3979214Z   local time: Wed Mar 25 17:50:59 UTC 2020
2020-03-25T17:50:59.5600303Z   network time: Wed, 25 Mar 2020 17:50:59 GMT
2020-03-25T17:50:59.5600769Z == end clock drift check ==
2020-03-25T17:51:06.2018453Z 
2020-03-25T17:51:06.2057925Z ##[error]Bash exited with code '1'.
2020-03-25T17:51:06.2068696Z ##[section]Finishing: Run build
2020-03-25T17:51:06.2109266Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/70362/merge to s
2020-03-25T17:51:06.2113901Z Task         : Get sources
2020-03-25T17:51:06.2114176Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-25T17:51:06.2114438Z Version      : 1.0.0
2020-03-25T17:51:06.2114629Z Author       : Microsoft
2020-03-25T17:51:06.2114629Z Author       : Microsoft
2020-03-25T17:51:06.2114911Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-03-25T17:51:06.2115234Z ==============================================================================
2020-03-25T17:51:06.5234827Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-03-25T17:51:06.5283581Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/70362/merge to s
2020-03-25T17:51:06.5383425Z Cleaning up task key
2020-03-25T17:51:06.5384608Z Start cleaning up orphan processes.
2020-03-25T17:51:06.5563871Z Terminate orphan process: pid (3465) (python)
2020-03-25T17:51:06.5752132Z ##[section]Finishing: Finalize Job

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 @rust-lang/infra. (Feature Requests)

src/liballoc/raw_vec.rs

Amanieu · 2020-03-25T21:24:45Z

@bors try @rust-timer queue

rust-timer · 2020-03-25T21:24:47Z

Awaiting bors try build completion

bors · 2020-03-25T21:24:57Z

⌛ Trying commit 44440b3cc53fdee09b42d6add442729b7795b6ec with merge 596ca62e7a53ded2213f364156eae2a6a5478c8f...

bors · 2020-03-26T00:00:57Z

☀️ Try build successful - checks-azure
Build commit: 596ca62e7a53ded2213f364156eae2a6a5478c8f (596ca62e7a53ded2213f364156eae2a6a5478c8f)

rust-timer · 2020-03-26T00:00:58Z

Queued 596ca62e7a53ded2213f364156eae2a6a5478c8f with parent 3c1d9ad, future comparison URL.

src/libcore/alloc/mod.rs

rust-timer · 2020-03-26T03:21:21Z

Finished benchmarking try commit 596ca62e7a53ded2213f364156eae2a6a5478c8f, comparison URL.

TimDiekmann · 2020-03-26T09:20:41Z

Finished benchmarking try commit 596ca62, comparison URL.

The average from both, all cpu-clock avg values and all task-clock avg values, is 0.692% and 0.693% respectively, which is fine I think. The biggest regression we have in a stress test, all other regressions (if any) are below 3%. In comparison to the last perf-run this is much better.

src/libcore/alloc/layout.rs

Amanieu · 2020-03-26T10:34:12Z

@bors try @rust-timer queue

rust-timer · 2020-03-26T10:34:13Z

Awaiting bors try build completion

bors · 2020-03-26T10:34:24Z

⌛ Trying commit 78f6ca31edcc805151e7cf72cb922673386a738e with merge 266627c4feaf72ec1b9019f3a957804478ef516c...

bors · 2020-03-26T13:04:35Z

☀️ Try build successful - checks-azure
Build commit: 266627c4feaf72ec1b9019f3a957804478ef516c (266627c4feaf72ec1b9019f3a957804478ef516c)

rust-timer · 2020-03-26T13:04:37Z

Queued 266627c4feaf72ec1b9019f3a957804478ef516c with parent a17dd36, future comparison URL.

Dylan-DPC-zz · 2020-04-01T20:30:30Z

@bors retry yield

bors · 2020-04-02T06:08:41Z

⌛ Testing commit 89ed59d with merge 127a11a...

bors · 2020-04-02T09:10:00Z

☀️ Test successful - checks-azure
Approved by: Amanieu
Pushing 127a11a to master...

rust-highfive · 2020-04-02T09:11:14Z

📣 Toolstate changed by #70362!

Tested on commit 127a11a.
Direct link to PR: #70362

💔 nomicon on windows: test-pass → test-fail (cc @Gankra @frewsxcv).
💔 nomicon on linux: test-pass → test-fail (cc @Gankra @frewsxcv).

@Gankra

Tested on commit rust-lang/rust@127a11a. Direct link to PR: <rust-lang/rust#70362> 💔 nomicon on windows: test-pass → test-fail (cc @Gankra @frewsxcv). 💔 nomicon on linux: test-pass → test-fail (cc @Gankra @frewsxcv).

rustup for AllocRef changes Cc rust-lang/rust#70362

src/libcore/alloc/mod.rs

rustup for AllocRef changes Cc rust-lang/rust#70362

This was accidentally removed in rust-lang#70362 56cbf2f

…ruppe re-add Layout::for_value_raw Tracking issue: rust-lang#69835 This was accidentally removed in rust-lang#70362 56cbf2f. Originally added in rust-lang#69079.

rust-highfive assigned Amanieu Mar 24, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 24, 2020

TimDiekmann mentioned this pull request Mar 24, 2020

Overhaul of the AllocRef trait to match allocator-wg's latest consens #69889

Closed

TimDiekmann force-pushed the alloc-overhaul branch from fb2e3c4 to 14b6d13 Compare March 24, 2020 21:24

Amanieu reviewed Mar 25, 2020

View reviewed changes

src/liballoc/raw_vec.rs Outdated Show resolved Hide resolved

src/liballoc/raw_vec.rs Outdated Show resolved Hide resolved

This was referenced Mar 25, 2020

Avoid tagging as I-nominated on toolstate breakage #70407

Merged

gitignore: allow target to be a symlink #70409

Merged

Amanieu reviewed Mar 26, 2020

View reviewed changes

src/libcore/alloc/mod.rs Outdated Show resolved Hide resolved

src/libcore/alloc/mod.rs Outdated Show resolved Hide resolved

Amanieu reviewed Mar 26, 2020

View reviewed changes

src/libcore/alloc/layout.rs Outdated Show resolved Hide resolved

TimDiekmann added 5 commits March 26, 2020 17:10

Overhaul of the AllocRef trait to match allocator-wg's latest consens

56cbf2f

Fix issues from review and unsoundness of RawVec::into_box

2526acc

Use NonNull instead of Unique in MemoryBlock

2f215b6

Add comment to AllocRef implementation for System

d9d35cc

Fix ZST handling for RawVec

c1fa023

bors mentioned this pull request Apr 1, 2020

Rollup of 6 pull requests #70672

Merged

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 2, 2020

bors merged commit 127a11a into rust-lang:master Apr 2, 2020

This was referenced Apr 2, 2020

Stabilize most common subset of alloc_layout_extras #69362

Merged

impl FromIterator<char> for Box<str> #70094

Closed

RalfJung mentioned this pull request Apr 2, 2020

rustup for AllocRef changes rust-lang/miri#1296

Merged

bors added a commit to rust-lang/miri that referenced this pull request Apr 2, 2020

Auto merge of #1296 - RalfJung:rustup, r=RalfJung

99221f7

rustup for AllocRef changes Cc rust-lang/rust#70362

RalfJung reviewed Apr 2, 2020

View reviewed changes

src/libcore/alloc/mod.rs Show resolved Hide resolved

RalfJung reviewed Apr 2, 2020

View reviewed changes

src/libcore/alloc/mod.rs Show resolved Hide resolved

RalfJung reviewed Apr 2, 2020

View reviewed changes

src/libcore/alloc/mod.rs Show resolved Hide resolved

bors added a commit to rust-lang/miri that referenced this pull request Apr 2, 2020

Auto merge of #1296 - RalfJung:rustup, r=RalfJung

82d46b4

rustup for AllocRef changes Cc rust-lang/rust#70362

TimDiekmann deleted the alloc-overhaul branch April 2, 2020 12:07

alexcrichton mentioned this pull request Apr 3, 2020

Wasmtime trap tests failing on most recent nightlly bytecodealliance/wasmtime#1465

Closed

tspiteri mentioned this pull request Apr 4, 2020

use ManuallyDrop instead of forget inside collections #70766

Merged

phil-opp mentioned this pull request Apr 7, 2020

Update AllocRef implementation for latest API changes rust-osdev/linked-list-allocator#30

Merged

Amanieu mentioned this pull request Apr 21, 2020

Vec::reserve should use alloc_excess #71383

Open

palfrey mentioned this pull request Apr 29, 2020

Nightly fixes proptest-rs/proptest#191

Merged

CAD97 mentioned this pull request May 9, 2020

Tracking issue for alloc_layout_extra #55724

Closed

CAD97 mentioned this pull request Jul 18, 2020

re-add Layout::for_value_raw #74488

Merged

CAD97 added a commit to CAD97/rust that referenced this pull request Jul 18, 2020

re-add Layout::for_value_raw

1821e3d

This was accidentally removed in rust-lang#70362 56cbf2f

TimDiekmann mentioned this pull request Aug 12, 2020

Support reallocating to a different alignment? rust-lang/wg-allocators#5

Closed

RalfJung mentioned this pull request Jun 28, 2023

Allocator traits and std::heap #32838

Open

12 tasks

Uh oh!

Conversation

TimDiekmann commented Mar 24, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rust-highfive commented Mar 25, 2020

Uh oh!

Uh oh!

Uh oh!

Amanieu commented Mar 25, 2020

Uh oh!

rust-timer commented Mar 25, 2020

Uh oh!

bors commented Mar 25, 2020

Uh oh!

bors commented Mar 26, 2020

Uh oh!

rust-timer commented Mar 26, 2020

Uh oh!

Uh oh!

Uh oh!

rust-timer commented Mar 26, 2020

Uh oh!

TimDiekmann commented Mar 26, 2020

Uh oh!

Uh oh!

Amanieu commented Mar 26, 2020

Uh oh!

rust-timer commented Mar 26, 2020

Uh oh!

bors commented Mar 26, 2020

Uh oh!

bors commented Mar 26, 2020

Uh oh!

rust-timer commented Mar 26, 2020

Uh oh!

Dylan-DPC-zz commented Apr 1, 2020

Uh oh!

bors commented Apr 2, 2020

Uh oh!

bors commented Apr 2, 2020

Uh oh!

rust-highfive commented Apr 2, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants