Move the query system to a dedicated crate by cjgillot · Pull Request #70162 · rust-lang/rust

cjgillot · 2020-03-19T18:23:08Z

The query system rustc::ty::query is split out into the rustc_query_system crate.

Some commits are unformatted, to ease rebasing.

bors · 2020-03-21T11:26:23Z

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

cjgillot · 2020-03-24T19:39:41Z

Rebased. Comments from #67761 and #69910 have been applied.

Zoxc · 2020-03-24T20:09:52Z

@bors try @rust-timer queue

rust-timer · 2020-03-24T20:09:53Z

Awaiting bors try build completion

bors · 2020-03-24T20:10:03Z

⌛ Trying commit 8d22625da2fe03beca659384566a38fdab040351 with merge 0d717b485ce2213e0c429a599935baa71c4286ca...

src/librustc/ty/context.rs

src/librustc/ty/query/config.rs

src/librustc/ty/query/caches.rs

src/librustc/ty/query/plumbing.rs

bors · 2020-03-24T22:46:59Z

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

Zoxc · 2020-03-24T23:25:17Z

@rust-timer build 0d717b485ce2213e0c429a599935baa71c4286ca

rust-timer · 2020-03-24T23:25:19Z

Queued 0d717b485ce2213e0c429a599935baa71c4286ca with parent 2dcf54f, future comparison URL.

cjgillot · 2020-03-24T23:26:45Z

Rebased TLS commit removed and review applied.

src/librustc/ty/query/plumbing.rs

rust-timer · 2020-03-25T03:52:52Z

Finished benchmarking try commit 0d717b485ce2213e0c429a599935baa71c4286ca, comparison URL.

bors · 2020-03-25T09:14:34Z

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

cjgillot · 2020-03-25T11:04:16Z

Rebased with review applied.

bors · 2020-03-25T18:16:44Z

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

cjgillot · 2020-03-26T08:59:31Z

Rebased.

src/librustc/ty/query/plumbing.rs

src/librustc_query_system/lib.rs

src/librustc_query_system/query/config.rs

src/librustc_query_system/query/plumbing.rs

Zoxc · 2020-03-27T07:13:37Z

src/librustc_query_system/lib.rs

-pub trait HashStableContext {
-    fn debug_dep_tasks(&self) -> bool;
-}
+pub trait HashStableContext {}


This trait seems useless now =P

It is used by the macro HashStable_Generic for WorkProductId. I can implement it by hand also.

Zoxc · 2020-03-27T07:30:52Z

@bors p=1 r+

bors · 2020-03-27T07:30:53Z

📌 Commit 222d010 has been approved by Zoxc

cjgillot · 2020-03-27T07:37:10Z

Oops, sorry.

Zoxc · 2020-03-27T20:02:47Z

@bors r+

bors · 2020-03-27T20:02:48Z

📌 Commit 2d7bbda has been approved by Zoxc

bors · 2020-03-27T21:36:57Z

⌛ Testing commit 2d7bbda with merge 0bf7c2a...

bors · 2020-03-28T00:36:42Z

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

Zoxc · 2020-03-29T06:33:14Z

Looks like this regressed incremental benchmarks. There's probably some things that could use #[inline] attributes here.

rust-highfive assigned Zoxc Mar 19, 2020

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

cjgillot force-pushed the split_query branch from 5c03097 to 51b168b Compare March 20, 2020 09:49

cjgillot force-pushed the split_query branch 2 times, most recently from 3b43778 to 8d22625 Compare March 24, 2020 19:37

Zoxc reviewed Mar 24, 2020

View reviewed changes

src/librustc/ty/context.rs Outdated Show resolved Hide resolved

Zoxc reviewed Mar 24, 2020

View reviewed changes

src/librustc/ty/query/config.rs Outdated Show resolved Hide resolved

Zoxc reviewed Mar 24, 2020

View reviewed changes

src/librustc/ty/query/caches.rs Outdated Show resolved Hide resolved

Zoxc reviewed Mar 24, 2020

View reviewed changes

src/librustc/ty/query/plumbing.rs Outdated Show resolved Hide resolved

cjgillot force-pushed the split_query branch from 8d22625 to 3923bf2 Compare March 24, 2020 23:24

Zoxc reviewed Mar 25, 2020

View reviewed changes

src/librustc/ty/query/plumbing.rs Outdated Show resolved Hide resolved

Zoxc reviewed Mar 25, 2020

View reviewed changes

src/librustc/ty/query/plumbing.rs Outdated Show resolved Hide resolved

Zoxc reviewed Mar 25, 2020

View reviewed changes

src/librustc/ty/query/plumbing.rs Outdated Show resolved Hide resolved

Zoxc reviewed Mar 25, 2020

View reviewed changes

src/librustc/ty/query/plumbing.rs Outdated Show resolved Hide resolved

cjgillot force-pushed the split_query branch from eef6034 to d5d8754 Compare March 25, 2020 11:03

cjgillot force-pushed the split_query branch from d5d8754 to 59cf47d Compare March 25, 2020 18:45

cjgillot added 5 commits March 26, 2020 09:40

Move generics on QueryCache.

fa06cfd

Simplify generics on try_start.

5dfed41

Add comment.

fce0d37

Rename read_query_job -> current_query_job and simplify it.

d224e21

Don't allow access to the Session.

260cfab

cjgillot force-pushed the split_query branch from 59cf47d to 260cfab Compare March 26, 2020 08:59

Zoxc reviewed Mar 26, 2020

View reviewed changes

src/librustc/ty/query/plumbing.rs Outdated Show resolved Hide resolved

Zoxc reviewed Mar 26, 2020

View reviewed changes

src/librustc_query_system/lib.rs Outdated Show resolved Hide resolved

Zoxc reviewed Mar 26, 2020

View reviewed changes

src/librustc_query_system/query/config.rs Outdated Show resolved Hide resolved

Zoxc reviewed Mar 26, 2020

View reviewed changes

src/librustc_query_system/query/plumbing.rs Outdated Show resolved Hide resolved

cjgillot added 3 commits March 27, 2020 07:35

Remove the QueryGetter trait.

4faf701

Move QueryContext to the parent module.

db5be1f

Cleanups.

222d010

Zoxc reviewed Mar 27, 2020

View reviewed changes

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 Mar 27, 2020

Implement HashStable directly.

2d7bbda

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 28, 2020

bors mentioned this pull request Mar 28, 2020

Make dep node indices persistent between sessions #62038

Closed

bors merged commit 0bf7c2a into rust-lang:master Mar 28, 2020

cjgillot deleted the split_query branch March 28, 2020 08:31

Uh oh!

Conversation

cjgillot commented Mar 19, 2020

Uh oh!

bors commented Mar 21, 2020

Uh oh!

cjgillot commented Mar 24, 2020

Uh oh!

Zoxc commented Mar 24, 2020

Uh oh!

rust-timer commented Mar 24, 2020

Uh oh!

bors commented Mar 24, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bors commented Mar 24, 2020

Uh oh!

Zoxc commented Mar 24, 2020

Uh oh!

rust-timer commented Mar 24, 2020

Uh oh!

cjgillot commented Mar 24, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rust-timer commented Mar 25, 2020

Uh oh!

bors commented Mar 25, 2020

Uh oh!

cjgillot commented Mar 25, 2020

Uh oh!

bors commented Mar 25, 2020

Uh oh!

cjgillot commented Mar 26, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Zoxc Mar 27, 2020

Choose a reason for hiding this comment

Uh oh!

cjgillot Mar 27, 2020

Choose a reason for hiding this comment

Uh oh!

Zoxc commented Mar 27, 2020

Uh oh!

bors commented Mar 27, 2020

Uh oh!

cjgillot commented Mar 27, 2020

Uh oh!

Zoxc commented Mar 27, 2020

Uh oh!

bors commented Mar 27, 2020

Uh oh!

bors commented Mar 27, 2020

Uh oh!

bors commented Mar 28, 2020

Uh oh!

Zoxc commented Mar 29, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants