Allocate HIR on an arena 4/4#67032

cjgillot · 2019-12-04T18:58:17Z

This is the fourth and last PR in the series started by #66931, #66936 and #66942.

The last commits should compile on their own.
The difference with the previous PR is given by cjgillot/rust@hirene-ty...hirene

A few more cleanups may be necessary, please tell me.

r? @eddyb like the other
cc @Zoxc

bors · 2019-12-05T17:49:25Z

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

nikomatsakis · 2019-12-09T21:01:31Z

@bors try

bors · 2019-12-09T21:01:45Z

⌛ Trying commit d2d2d87174ffd603bf50cdc2ff45470f41fb93a7 with merge 0ec0a48c6ef3b0564708503413d7d1c44661ea02...

nikomatsakis · 2019-12-09T22:22:54Z

@rust-timer queue

rust-timer · 2019-12-09T22:22:56Z

Awaiting bors try build completion

bors · 2019-12-09T23:21:39Z

☀️ Try build successful - checks-azure
Build commit: 0ec0a48c6ef3b0564708503413d7d1c44661ea02 (0ec0a48c6ef3b0564708503413d7d1c44661ea02)

rust-timer · 2019-12-09T23:21:42Z

Queued 0ec0a48c6ef3b0564708503413d7d1c44661ea02 with parent 7de9402, future comparison URL.

rust-timer · 2019-12-10T00:33:56Z

Finished benchmarking try commit 0ec0a48c6ef3b0564708503413d7d1c44661ea02, comparison URL.

cjgillot · 2019-12-10T13:35:35Z

For some reason, the perf link does not show anything.

nikomatsakis · 2019-12-10T22:03:46Z

Yeah, seems like perf is broken in some way :(

nikomatsakis · 2019-12-11T15:21:39Z

@bors try @rust-timer queue

rust-timer · 2019-12-11T15:21:41Z

Awaiting bors try build completion

bors · 2019-12-11T15:21:45Z

🔒 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 hirene (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 hirene --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

Auto-merging src/librustdoc/clean/mod.rs
CONFLICT (content): Merge conflict in src/librustdoc/clean/mod.rs
Removing src/librustc/hir/ptr.rs
Automatic merge failed; fix conflicts and then commit the result.

nikomatsakis · 2019-12-11T15:22:09Z

@Mark-Simulacrum advised to re-try and re-measure, so giving that a try...

nikomatsakis · 2019-12-11T15:22:25Z

However, @cjgillot, looks like it may require a rebase before we can do that :(

bors · 2019-12-11T15:46:48Z

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

cjgillot · 2019-12-11T16:53:09Z

Rebased.

matthewjasper · 2019-12-11T17:16:31Z

@bors try @rust-timer queue

rust-timer · 2019-12-11T17:16:33Z

Awaiting bors try build completion

bors · 2019-12-11T17:16:43Z

⌛ Trying commit 7065e6f6fe1f7558a5d5c9980b02dee9a151713a with merge ca130cab255007b372e6fb2e289d84713253226e...

bors · 2019-12-11T20:01:06Z

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

rust-timer · 2019-12-11T20:01:08Z

Queued ca130cab255007b372e6fb2e289d84713253226e with parent 90b957a, future comparison URL.

bors · 2019-12-26T20:03:14Z

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

bors · 2019-12-30T02:06:31Z

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

cjgillot · 2019-12-30T10:37:34Z

Rebased.

src/librustc/hir/lowering.rs

src/librustc/hir/lowering/item.rs

src/librustc_typeck/astconv.rs

Zoxc · 2019-12-30T22:24:22Z

src/librustc/hir/lowering.rs

 /// Helper struct for delayed construction of GenericArgs.
 struct GenericArgsCtor<'hir> {
-    args: Vec<hir::GenericArg<'hir>>,
+    args: SmallVec<[hir::GenericArg<'hir>; 1]>,


I'd put 4 here and in GenericsCtor. 1 seems too small

Zoxc · 2019-12-30T22:47:16Z

@bors r+

bors · 2019-12-30T22:47:18Z

📌 Commit ac8c0f4 has been approved by Zoxc

bors · 2019-12-31T03:27:43Z

⌛ Testing commit ac8c0f4 with merge bf2d145...

@eddyb

Allocate HIR on an arena 4/4 This is the fourth and last PR in the series started by #66931, #66936 and #66942. The last commits should compile on their own. The difference with the previous PR is given by cjgillot/rust@hirene-ty...hirene A few more cleanups may be necessary, please tell me. r? @eddyb like the other cc @Zoxc

bors · 2019-12-31T06:44:35Z

☀️ Test successful - checks-azure
Approved by: Zoxc
Pushing bf2d145 to master...

Zoxc · 2019-12-31T10:22:43Z

Looks like this PR was a slight regression, unlike the other 3:
https://perf.rust-lang.org/compare.html?start=a9dd56ff9a08d74c53d5cc22d18f126a12749608&end=bf2d145c62888c853db0bcfd8f5b3a6919f15502&stat=instructions:u

rust-highfive assigned eddyb Dec 4, 2019

hdhoang added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 5, 2019

cjgillot force-pushed the hirene branch from 974c329 to d2d2d87 Compare December 9, 2019 12:18

nikomatsakis mentioned this pull request Dec 9, 2019

Allocate HIR on an arena 1/4 #66931

Merged

cjgillot force-pushed the hirene branch from d2d2d87 to 7065e6f Compare December 11, 2019 16:51

cjgillot force-pushed the hirene branch from ad66e2c to 4b1e796 Compare December 26, 2019 17:06

cjgillot force-pushed the hirene branch from 4b1e796 to faa3a9a Compare December 26, 2019 22:53

cjgillot added 6 commits December 30, 2019 11:29

Remove HirVec from Generics.

aa3678d

Retire HirVec.

e2c9dd7

Retire hir::ptr.

e569ada

Allocate inside lower_path_extra.

2d74e9b

Avoid a few allocations.

4d77382

Duplicate allocations in lowering.

8f05d12

cjgillot force-pushed the hirene branch from faa3a9a to 8f05d12 Compare December 30, 2019 10:37

Zoxc reviewed Dec 30, 2019

View reviewed changes

src/librustc/hir/lowering.rs Outdated Show resolved Hide resolved

Zoxc reviewed Dec 30, 2019

View reviewed changes

src/librustc/hir/lowering/item.rs Outdated Show resolved Hide resolved

Zoxc reviewed Dec 30, 2019

View reviewed changes

src/librustc_typeck/astconv.rs Outdated Show resolved Hide resolved

Reduce allocations.

be6cb63

Zoxc reviewed Dec 30, 2019

View reviewed changes

Enlarge smallvec.

ac8c0f4

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 Dec 30, 2019

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 31, 2019

bors merged commit ac8c0f4 into rust-lang:master Dec 31, 2019

bors mentioned this pull request Dec 31, 2019

Move resolve_lifetimes query in librustc_resolve. #67699

Merged

cjgillot deleted the hirene branch December 31, 2019 09:21

Uh oh!

Conversation

cjgillot commented Dec 4, 2019

Uh oh!

bors commented Dec 5, 2019

Uh oh!

nikomatsakis commented Dec 9, 2019

Uh oh!

bors commented Dec 9, 2019

Uh oh!

nikomatsakis commented Dec 9, 2019

Uh oh!

rust-timer commented Dec 9, 2019

Uh oh!

bors commented Dec 9, 2019

Uh oh!

rust-timer commented Dec 9, 2019

Uh oh!

rust-timer commented Dec 10, 2019

Uh oh!

cjgillot commented Dec 10, 2019

Uh oh!

nikomatsakis commented Dec 10, 2019

Uh oh!

nikomatsakis commented Dec 11, 2019

Uh oh!

rust-timer commented Dec 11, 2019

Uh oh!

bors commented Dec 11, 2019

Uh oh!

nikomatsakis commented Dec 11, 2019

Uh oh!

nikomatsakis commented Dec 11, 2019

Uh oh!

bors commented Dec 11, 2019

Uh oh!

cjgillot commented Dec 11, 2019

Uh oh!

matthewjasper commented Dec 11, 2019

Uh oh!

rust-timer commented Dec 11, 2019

Uh oh!

bors commented Dec 11, 2019

Uh oh!

bors commented Dec 11, 2019

Uh oh!

rust-timer commented Dec 11, 2019

Uh oh!

bors commented Dec 26, 2019

Uh oh!

bors commented Dec 30, 2019

Uh oh!

cjgillot commented Dec 30, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Zoxc Dec 30, 2019

Choose a reason for hiding this comment

Uh oh!

Zoxc commented Dec 30, 2019

Uh oh!

bors commented Dec 30, 2019

Uh oh!

bors commented Dec 31, 2019

Uh oh!

bors commented Dec 31, 2019

Uh oh!

Zoxc commented Dec 31, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants