Introduce an arena type which may be used to allocate a list of types with destructors#59536

Zoxc · 2019-03-29T20:12:50Z

You can also specify that you want deserializers for &'tcx [T] and &'tcx T for a type in the list, which will allocate those using the arena.

Based on #59517 and #59533. Look at the last commit for the interesting changes.

An alternative to #56448. cc @michaelwoerister @eddyb

r? @oli-obk

Zoxc · 2019-03-29T20:13:34Z

src/librustc/arena.rs

+                rustc::ty::subst::SubstsRef<$tcx>
+            )>,
+            [decode] specialization_graph: rustc::traits::specialization_graph::Graph,
+        ], $tcx);


The list of types are declared here with a macro.

eddyb · 2019-03-29T20:32:14Z

r=me on that last commit, very nice!

Zoxc · 2019-03-29T23:30:20Z

src/librustc/arena.rs

+    #[inline]
+    default fn arena<'a>(_: &'a Arena<'tcx>) -> Option<&'a TypedArena<Self>> {
+        None
+    }


This impl can conflict with the types in the list :(

error[E0119]: conflicting implementations of trait `arena::ArenaAllocatable<'_>` for type `std::collections::HashSet<hir::item_local_id_inner::ItemLocalId, std::hash::BuildHasherDefault<rustc_data_structures::fx::FxHasher>>`: --> src\librustc\arena.rs:42:13 | 4 | / macro_rules! arena_types { 5 | | ($macro:path, $args:tt, $tcx:lifetime) => ( 6 | | $macro!($args, [ | |_________- 7 | || [] vtable_method: Option<( 8 | || rustc::hir::def_id::DefId, 9 | || rustc::ty::subst::SubstsRef<$tcx> ... || 15 | || [] item_local_set: rustc::util::nodemap::ItemLocalSet, 16 | || ], $tcx); | ||_________________- in this macro invocation 17 | | ) 18 | | } | |_- in this expansion of `arena_types!` ... 37 | / macro_rules! impl_arena_allocatable { 38 | | ([], [$($a:tt $name:ident: $ty:ty,)*], $tcx:lifetime) => { 39 | | $( 40 | | impl_specialized_decodable!($a $ty, $tcx); 41 | | 42 | | impl<$tcx> ArenaAllocatable<$tcx> for $ty { | | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `std::collections::HashSet<hir::item_local_id_inner::ItemLocalId, std::hash::BuildHasherDefault<rustc_data_structures::fx::FxHasher>>` ... | 49 | | } 50 | | } | |__- in this expansion of `impl_arena_allocatable!` ... 54 | arena_types!(impl_arena_allocatable, [], 'tcx); | ----------------------------------------------- in this macro invocation ... 62 | impl<'tcx, T: Copy> ArenaAllocatable<'tcx> for T { | ------------------------------------------------ first implementation here | = note: upstream crates may add new impl of trait `std::marker::Copy` for type `std::collections::HashSet<hir::item_local_id_inner::ItemLocalId, std::hash::BuildHasherDefault<rustc_data_structures::fx::FxHasher>>` in future versions error: aborting due to previous error

Do we have some way to express an ArenaAllocatable or Copy bound?

Oh wow, it would be nice to be able to rely on sets and maps never being Copy...

I found a way around this using a marker trait.

bors · 2019-03-30T17:31:48Z

☔ The latest upstream changes (presumably #59561) made this pull request unmergeable. Please resolve the merge conflicts.

Zoxc · 2019-03-30T20:21:52Z

I added a DropArena type which allows allocating types with destructors in a single arena. It's intended for types which we only allocate for the local crate or per crate. It allocates slower since it has to record the destructors, but is more memory efficient than using multiple almost empty arenas.

Zoxc · 2019-03-30T23:11:57Z

@bors try

bors · 2019-03-30T23:12:05Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout the-arena (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self the-arena --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

Zoxc · 2019-03-31T00:00:29Z

@bors try

@michaelwoerister

Introduce an arena type which may be used to allocate a list of types with destructors You can also specify that you want deserializers for `&'tcx [T]` and `&'tcx T` for a type in the list, which will allocate those using the arena. Based on #59517 and #59533. Look at the last commit for the interesting changes. An alternative to #56448. cc @michaelwoerister @eddyb r? @oli-obk

bors · 2019-03-31T00:01:03Z

⌛ Trying commit 114a000 with merge bb306b0...

bors · 2019-03-31T02:08:59Z

☀️ Try build successful - checks-travis
Build commit: bb306b0

Zoxc · 2019-03-31T02:14:03Z

@rust-timer build bb306b0

rust-timer · 2019-03-31T02:14:04Z

Success: Queued bb306b0 with parent befeeb7, comparison URL.

rust-timer · 2019-03-31T06:07:46Z

Finished benchmarking try commit bb306b0

… with destructors

…se specialization to find the right field

Zoxc · 2019-04-04T23:03:32Z

The last 3 commits also need a review here.

Zoxc · 2019-04-05T05:09:43Z

@bors try

bors · 2019-04-05T05:09:57Z

⌛ Trying commit 43e33ea with merge 55ed5f73fc9910209ee1affaa62b5c688ce6b872...

bors · 2019-04-05T07:21:16Z

☀️ Try build successful - checks-travis
Build commit: 55ed5f73fc9910209ee1affaa62b5c688ce6b872

bors · 2019-04-12T06:10:26Z

⌛ Testing commit 223f1c7 with merge 2226c09...

@michaelwoerister

Introduce an arena type which may be used to allocate a list of types with destructors You can also specify that you want deserializers for `&'tcx [T]` and `&'tcx T` for a type in the list, which will allocate those using the arena. Based on #59517 and #59533. Look at the last commit for the interesting changes. An alternative to #56448. cc @michaelwoerister @eddyb r? @oli-obk

bors · 2019-04-12T08:58:51Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: eddyb
Pushing 2226c09 to master...

[WIP] Use arenas to avoid Lrc in queries #1 Based on #59536.

Use arenas to avoid Lrc in queries #1 Based on #59536.

rust-highfive assigned oli-obk Mar 29, 2019

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

Zoxc commented Mar 29, 2019

View reviewed changes

Zoxc mentioned this pull request Mar 29, 2019

Use arenas to avoid Lrc in queries #1 #59540

Merged

Zoxc commented Mar 29, 2019

View reviewed changes

Zoxc force-pushed the the-arena branch from 62fa7a8 to 521f169 Compare March 30, 2019 20:17

Zoxc force-pushed the the-arena branch from 521f169 to 114a000 Compare March 31, 2019 00:00

oli-obk mentioned this pull request Apr 3, 2019

Move query definitions over to the proc macro #59517

Merged

Zoxc added 4 commits April 5, 2019 00:55

Introduce an arena type which may be used to allocate a list of types…

002c70f

… with destructors

Make ArenaAllocatable a marker trait to allow overlapping impls and u…

e835d27

…se specialization to find the right field

Impl UseSpecializedDecodable for &T

4ccb9ae

Add DropArena and use it to allocate types with few allocations

43e33ea

Zoxc force-pushed the the-arena branch from 114a000 to 43e33ea Compare April 4, 2019 23:00

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 12, 2019

bors merged commit 223f1c7 into rust-lang:master Apr 12, 2019

Zoxc deleted the the-arena branch April 12, 2019 09:09

bors mentioned this pull request Apr 12, 2019

Remove queries from rustc_interface #59904

Closed

bors added a commit that referenced this pull request Apr 13, 2019

Auto merge of #59540 - Zoxc:the-arena-2, r=<try>

f426a56

[WIP] Use arenas to avoid Lrc in queries #1 Based on #59536.

Dylan-DPC-zz removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 15, 2019

bors added a commit that referenced this pull request Apr 21, 2019

Auto merge of #59540 - Zoxc:the-arena-2, r=<try>

d1afee2

[WIP] Use arenas to avoid Lrc in queries #1 Based on #59536.

bors added a commit that referenced this pull request Apr 22, 2019

Auto merge of #59540 - Zoxc:the-arena-2, r=<try>

af8da1f

[WIP] Use arenas to avoid Lrc in queries #1 Based on #59536.

bors added a commit that referenced this pull request Apr 25, 2019

Auto merge of #59540 - Zoxc:the-arena-2, r=<try>

6da7e37

[WIP] Use arenas to avoid Lrc in queries #1 Based on #59536.

bors added a commit that referenced this pull request Apr 27, 2019

Auto merge of #59540 - Zoxc:the-arena-2, r=michaelwoerister

cfeb917

Use arenas to avoid Lrc in queries #1 Based on #59536.

Uh oh!

Conversation

Zoxc commented Mar 29, 2019

Uh oh!

Zoxc Mar 29, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

eddyb commented Mar 29, 2019

Uh oh!

Zoxc Mar 29, 2019

Choose a reason for hiding this comment

Uh oh!

eddyb Mar 30, 2019

Choose a reason for hiding this comment

Uh oh!

Zoxc Mar 30, 2019

Choose a reason for hiding this comment

Uh oh!

bors commented Mar 30, 2019

Uh oh!

Zoxc commented Mar 30, 2019

Uh oh!

Zoxc commented Mar 30, 2019

Uh oh!

bors commented Mar 30, 2019

Uh oh!

Zoxc commented Mar 31, 2019

Uh oh!

bors commented Mar 31, 2019

Uh oh!

bors commented Mar 31, 2019

Uh oh!

Zoxc commented Mar 31, 2019

Uh oh!

rust-timer commented Mar 31, 2019

Uh oh!

rust-timer commented Mar 31, 2019

Uh oh!

Zoxc commented Apr 4, 2019

Uh oh!

Zoxc commented Apr 5, 2019

Uh oh!

bors commented Apr 5, 2019

Uh oh!

bors commented Apr 5, 2019

Uh oh!

bors commented Apr 12, 2019

Uh oh!

bors commented Apr 12, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Zoxc Mar 29, 2019 •

edited

Loading