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 #57173

Closed
wants to merge 5 commits into from
Closed

Allocate HIR on an arena #57173

wants to merge 5 commits into from

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Dec 28, 2018

Blocked on #56864 #59205 (closed unmerged)

@rust-highfive
Copy link
Collaborator

r? @estebank

(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 Dec 28, 2018
@rust-highfive

This comment has been minimized.

@bors

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@Zoxc
Copy link
Contributor Author

Zoxc commented Jan 11, 2019

@bors try

@bors
Copy link
Contributor

bors commented Jan 11, 2019

⌛ Trying commit 274b927 with merge 6e789d4...

bors added a commit that referenced this pull request Jan 11, 2019
[WIP] Allocate HIR on an arena

Blocked on #56864
@rust-highfive

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Jan 11, 2019

☀️ Test successful - checks-travis
State: approved= try=True

@Zoxc
Copy link
Contributor Author

Zoxc commented Jan 11, 2019

@rust-timer build 6e789d4

@rust-timer
Copy link
Collaborator

Success: Queued 6e789d4 with parent 729d3f0, comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit 6e789d4

@TimNN TimNN added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 29, 2019
@rust-highfive

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@bors

This comment has been minimized.

@rust-highfive

This comment has been minimized.

) -> CFGIndex {
fn pats_all<'b, 'h: 'b, I: Iterator<Item=&'b P<'h, hir::Pat<'h>>>>(&mut self,
pats: I,
pred: CFGIndex) -> CFGIndex {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Intrigued by this change, the previous formatting was correct.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are a few of these changes were formatting is reverted to the formatting at the time I created the commit. Totally could use some rustfmt help.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you clean the indenting back to what it was here?

use serialize::{Encodable, Decodable, Encoder, Decoder};

use rustc_data_structures::stable_hasher::{StableHasher, StableHasherResult,
HashStable};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

formatting

src/librustc_resolve/resolve_imports.rs Outdated Show resolved Hide resolved
@Zoxc Zoxc force-pushed the hir-lifetime branch 2 times, most recently from a15bed1 to 2f2a2e2 Compare April 24, 2019 18:07
@rust-highfive

This comment has been minimized.

@bors

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@bors
Copy link
Contributor

bors commented May 5, 2019

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

@mark-i-m
Copy link
Member

mark-i-m commented Jun 7, 2019

This is no longer blocked, right?

@Zoxc
Copy link
Contributor Author

Zoxc commented Jun 7, 2019

Still blocked on #59205

pub struct LoweringContext<'a> {
macro_rules! p {
($this:expr, $e:expr) => ({
P::alloc($this.arena, $e)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if this could be just $this.alloc($e) and maybe then we wouldn't need a macro?
Then again, I think the macro allows nested allocations (e.g. p!(self, Foo(p!(self, Bar(...))))) without borrow conflicts, since $this.arena can just be copied.

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (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.
travis_time:end:05327421:start=1560548418041373799,finish=1560548420639481334,duration=2598107535
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---

[00:04:34] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:04:34] tidy error: /checkout/src/librustc_mir/build/mod.rs:518: line longer than 100 chars
[00:04:34] tidy error: /checkout/src/librustc/hir/lowering.rs:3337: line longer than 100 chars
[00:04:39] some tidy checks failed
[00:04:39] 
[00:04:39] 
[00:04:39] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:04:39] 
[00:04:39] 
[00:04:39] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:39] Build completed unsuccessfully in 0:01:11
---
travis_time:end:1e99c5c3:start=1560548711251426117,finish=1560548711256224005,duration=4797888
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:12b72805
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:1d43b7e8
travis_time:start:1d43b7e8
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:057bc055
$ dmesg | grep -i kill

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 @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Jun 15, 2019

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

@bors
Copy link
Contributor

bors commented Jun 15, 2019

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

@Dylan-DPC-zz
Copy link

The PR that this was blocked on was closed so unblocking it

@Dylan-DPC-zz Dylan-DPC-zz added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Dec 25, 2019
@Zoxc Zoxc closed this Dec 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants