Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allocate HIR on an arena 4/4 #67032

Merged
merged 8 commits into from Dec 31, 2019
Merged

Allocate HIR on an arena 4/4 #67032

merged 8 commits into from Dec 31, 2019

Conversation

@cjgillot
Copy link
Contributor

cjgillot commented Dec 4, 2019

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

This comment has been minimized.

Copy link
Contributor

bors commented Dec 5, 2019

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

@cjgillot cjgillot force-pushed the cjgillot:hirene branch from 974c329 to d2d2d87 Dec 9, 2019
@nikomatsakis

This comment has been minimized.

Copy link
Contributor

nikomatsakis commented Dec 9, 2019

@bors try

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 9, 2019

⌛️ Trying commit d2d2d87 with merge 0ec0a48...

bors added a commit that referenced this pull request Dec 9, 2019
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
@nikomatsakis

This comment has been minimized.

Copy link
Contributor

nikomatsakis commented Dec 9, 2019

@rust-timer queue

@rust-timer

This comment has been minimized.

Copy link

rust-timer commented Dec 9, 2019

Awaiting bors try build completion

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 9, 2019

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

@rust-timer

This comment has been minimized.

Copy link

rust-timer commented Dec 9, 2019

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

@rust-timer

This comment has been minimized.

Copy link

rust-timer commented Dec 10, 2019

Finished benchmarking try commit 0ec0a48, comparison URL.

@cjgillot

This comment has been minimized.

Copy link
Contributor Author

cjgillot commented Dec 10, 2019

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

@nikomatsakis

This comment has been minimized.

Copy link
Contributor

nikomatsakis commented Dec 10, 2019

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

@nikomatsakis

This comment has been minimized.

Copy link
Contributor

nikomatsakis commented Dec 11, 2019

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Copy link

rust-timer commented Dec 11, 2019

Awaiting bors try build completion

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 11, 2019

🔒 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:

  1. git checkout hirene (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. 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

This comment has been minimized.

Copy link
Contributor

nikomatsakis commented Dec 11, 2019

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

@nikomatsakis

This comment has been minimized.

Copy link
Contributor

nikomatsakis commented Dec 11, 2019

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

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 11, 2019

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

@cjgillot cjgillot force-pushed the cjgillot:hirene branch from d2d2d87 to 7065e6f Dec 11, 2019
@cjgillot

This comment has been minimized.

Copy link
Contributor Author

cjgillot commented Dec 11, 2019

Rebased.

@matthewjasper

This comment has been minimized.

Copy link
Contributor

matthewjasper commented Dec 11, 2019

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Copy link

rust-timer commented Dec 11, 2019

Awaiting bors try build completion

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 11, 2019

⌛️ Trying commit 7065e6f with merge ca130ca...

bors added a commit that referenced this pull request Dec 11, 2019
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

This comment has been minimized.

Copy link
Contributor

bors commented Dec 11, 2019

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

@rust-timer

This comment has been minimized.

Copy link

rust-timer commented Dec 11, 2019

Queued ca130ca with parent 90b957a, future comparison URL.

@cjgillot cjgillot force-pushed the cjgillot:hirene branch from ad66e2c to 4b1e796 Dec 26, 2019
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 26, 2019

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

@cjgillot cjgillot force-pushed the cjgillot:hirene branch from 4b1e796 to faa3a9a Dec 26, 2019
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 30, 2019

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

@cjgillot cjgillot force-pushed the cjgillot:hirene branch from faa3a9a to 8f05d12 Dec 30, 2019
@cjgillot

This comment has been minimized.

Copy link
Contributor Author

cjgillot commented Dec 30, 2019

Rebased.

src/librustc/hir/lowering.rs Outdated Show resolved Hide resolved
src/librustc/hir/lowering/item.rs Outdated Show resolved Hide resolved
src/librustc_typeck/astconv.rs Outdated Show resolved Hide resolved
@@ -3300,7 +3298,7 @@ fn body_ids(bodies: &BTreeMap<hir::BodyId, hir::Body<'hir>>) -> Vec<hir::BodyId>

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

This comment has been minimized.

Copy link
@Zoxc

Zoxc Dec 30, 2019

Contributor

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

@Zoxc

This comment has been minimized.

Copy link
Contributor

Zoxc commented Dec 30, 2019

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 30, 2019

📌 Commit ac8c0f4 has been approved by Zoxc

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 31, 2019

⌛️ Testing commit ac8c0f4 with merge bf2d145...

bors added a commit that referenced this pull request Dec 31, 2019
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

This comment has been minimized.

Copy link
Contributor

bors commented Dec 31, 2019

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

@bors bors added the merged-by-bors label Dec 31, 2019
@bors bors merged commit ac8c0f4 into rust-lang:master Dec 31, 2019
5 checks passed
5 checks passed
homu Test successful
Details
pr Build #20191230.66 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-7) Linux x86_64-gnu-llvm-7 succeeded
Details
pr (Linux x86_64-gnu-tools) Linux x86_64-gnu-tools succeeded
Details
@cjgillot cjgillot deleted the cjgillot:hirene branch Dec 31, 2019
@Zoxc

This comment has been minimized.

Copy link
Contributor

Zoxc commented Dec 31, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
8 participants
You can’t perform that action at this time.