Convert more queries to use `LocalDefId` #71292

marmeladema · 2020-04-18T16:59:29Z

This PR is based on commits in #71215 and should partially solve #70853

marmeladema · 2020-04-18T16:59:49Z

r? @eddyb

eddyb · 2020-04-18T17:02:53Z

@bors try @rust-timer queue

rust-timer · 2020-04-18T17:02:54Z

Awaiting bors try build completion

bors · 2020-04-18T17:03:04Z

⌛ Trying commit c17dd894ac6861fe689baf6ba16499de4de788dd with merge a70b0e7f3482873f39970306a89e352ead61b4f5...

bors · 2020-04-18T19:35:57Z

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

rust-timer · 2020-04-18T19:35:59Z

Queued a70b0e7f3482873f39970306a89e352ead61b4f5 with parent 339a938, future comparison URL.

bors · 2020-04-19T20:08:16Z

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

bors · 2020-04-23T00:40:51Z

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

bors · 2020-04-23T17:51:44Z

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

marmeladema · 2020-04-24T07:47:02Z

@eddyb #71215 has landed! Do you think you will have some time to review this one?

src/librustc_builtin_macros/format.rs

src/librustc_typeck/check/regionck.rs

eddyb · 2020-04-27T07:51:42Z

@bors r+

bors · 2020-04-27T07:51:43Z

📌 Commit 90639e2 has been approved by eddyb

…=eddyb Convert more queries to use `LocalDefId` This PR is based on commits in rust-lang#71215 and should partially solve rust-lang#70853

marmeladema · 2020-04-27T23:00:08Z

@Dylan-DPC @eddyb i just rebased over master and fixed the nits.

Dylan-DPC-zz · 2020-04-27T23:01:28Z

@bors r=eddyb

bors · 2020-04-27T23:01:29Z

📌 Commit 1349272 has been approved by eddyb

bors · 2020-04-28T05:01:32Z

⌛ Testing commit 1349272 with merge fb5615a...

bors · 2020-04-28T08:16:41Z

☀️ Test successful - checks-azure
Approved by: eddyb
Pushing fb5615a to master...

rust-highfive · 2020-04-28T08:18:16Z

📣 Toolstate changed by #71292!

Tested on commit fb5615a.
Direct link to PR: #71292

💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).

@oli-obk

Tested on commit rust-lang/rust@fb5615a. Direct link to PR: <rust-lang/rust#71292> 💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung). 💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).

marmeladema · 2020-04-28T08:19:04Z

@RalfJung
I think I broke miri again:

error[E0308]: mismatched types
  --> src\tools\miri\src\bin\miri.rs:42:61
   |
42 |             if let Some(return_code) = miri::eval_main(tcx, entry_def_id, config) {
   |                                                             ^^^^^^^^^^^^ expected struct `rustc_hir::def_id::DefId`, found struct `rustc_hir::def_id::LocalDefId`

error: aborting due to previous error

Sorry for the trouble

RalfJung · 2020-04-28T08:23:57Z

@marmeladema thanks for the notification!

RalfJung · 2020-04-28T08:27:52Z

src/librustc_middle/query/mod.rs

@@ -878,7 +886,7 @@ rustc_queries! {

        /// Identifies the entry-point (e.g., the `main` function) for a given
        /// crate, returning `None` if there is no entry point (such as for library crates).
-        query entry_fn(_: CrateNum) -> Option<(DefId, EntryFnType)> {
+        query entry_fn(_: CrateNum) -> Option<(LocalDefId, EntryFnType)> {


I am confused by this. I thought LocalDefId means "in the local crate", but entry_fn takes a CrateNum parameter and thus might return something in a different crate?

Since the query is cached, if it is called from another crate, it'll just fetch the cached version. This kind of trickery is used a lot

Oh, nevermind, that's wrong apparently, at least I'm reading @eddyb's comment below to meaning these are actually no-argument crates

RalfJung · 2020-04-28T08:29:11Z

src/librustc_passes/entry.rs

@@ -48,7 +48,7 @@ impl<'a, 'tcx> ItemLikeVisitor<'tcx> for EntryContext<'a, 'tcx> {
    }
 }

-fn entry_fn(tcx: TyCtxt<'_>, cnum: CrateNum) -> Option<(DefId, EntryFnType)> {
+fn entry_fn(tcx: TyCtxt<'_>, cnum: CrateNum) -> Option<(LocalDefId, EntryFnType)> {
    assert_eq!(cnum, LOCAL_CRATE);


Oh lol, okay this explains why the return type can be LocalDefId. Maybe the parameter should be removed, if there is only one possible value anyway?

Yes ultimately we should remove the the param, but i haven't tried yet. Allegedly ,the query macros do not handle "no key at all" in a query

I'll try to look at it. 👍

Allegedly ,the query macros do not handle "no key at all" in a query

As a work-around, the key could be of type (). ;)

@RalfJung query keys of type () are new, at the start the system only supported DefId and CrateNum, so queries that always take LOCAL_CRATE are an artifact of that.

We can also make the query system variadic by auto-tupling behind the scenes and hiding the tupling from the tcx methods and the providers :D.

rustup rust-lang/rust#71292 cc rust-lang/rust#71608 --- changelog: none

rust-highfive assigned davidtwco Apr 18, 2020

rust-highfive assigned eddyb and unassigned davidtwco Apr 18, 2020

JohnTitor added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 18, 2020

marmeladema force-pushed the queries-local-def-id branch from c17dd89 to f1a43bf Compare April 19, 2020 11:19

marmeladema force-pushed the queries-local-def-id branch from f1a43bf to 559236a Compare April 19, 2020 22:01

marmeladema force-pushed the queries-local-def-id branch from 559236a to a7e411e Compare April 23, 2020 09:27

marmeladema force-pushed the queries-local-def-id branch from a7e411e to 67cebf2 Compare April 24, 2020 07:45

marmeladema force-pushed the queries-local-def-id branch from 67cebf2 to 90639e2 Compare April 25, 2020 16:13

eddyb reviewed Apr 27, 2020

View reviewed changes

src/librustc_builtin_macros/format.rs Outdated Show resolved Hide resolved

eddyb reviewed Apr 27, 2020

View reviewed changes

src/librustc_typeck/check/regionck.rs Outdated Show resolved Hide resolved

eddyb approved these changes Apr 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 Apr 27, 2020

Dylan-DPC-zz mentioned this pull request Apr 27, 2020

Rollup of 5 pull requests #71603

Closed

marmeladema added 3 commits April 27, 2020 23:58

Accept LocalDefId as key for check_item_well_formed query

d9e5fa1

Accept LocalDefId as key for check_trait_item_well_formed query

14119a2

Accept LocalDefId as key for check_impl_item_well_formed query

1349272

marmeladema force-pushed the queries-local-def-id branch from 90639e2 to 1349272 Compare April 27, 2020 22:58

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 27, 2020

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

bors merged commit fb5615a into rust-lang:master Apr 28, 2020

marmeladema deleted the queries-local-def-id branch April 28, 2020 08:18

rust-highfive mentioned this pull request Apr 28, 2020

miri no longer builds after rust-lang/rust#71292 #71632

Closed

bors mentioned this pull request Apr 28, 2020

Got rid of repetitions (such as rustc_ast::ast::) in librustc_ast #71199

Closed

This was referenced Apr 28, 2020

Have the per-query caches store the results on arenas #70674

Merged

Avoid duplicating code for each query #69808

Merged

RalfJung reviewed Apr 28, 2020

View reviewed changes

bors mentioned this pull request Apr 28, 2020

Remove ast::{Ident, Name} reexports. #71555

Merged

matthiaskrgr mentioned this pull request Apr 28, 2020

clippy-driver no longer builds after rust-lang/rust#71268 #71608

Closed

matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Apr 28, 2020

rustup rust-lang/rust#71292

bdc9528

bors added a commit to rust-lang/rust-clippy that referenced this pull request Apr 28, 2020

Auto merge of #5543 - matthiaskrgr:rustup_45, r=flip1995

62bebd0

rustup rust-lang/rust#71292 cc rust-lang/rust#71608 --- changelog: none

bors added a commit to rust-lang/rust-clippy that referenced this pull request Apr 28, 2020

Auto merge of #5543 - matthiaskrgr:rustup_45, r=flip1995

9a3b0a0

rustup rust-lang/rust#71292 cc rust-lang/rust#71608 --- changelog: none

ThibsG pushed a commit to ThibsG/rust-clippy that referenced this pull request May 2, 2020

rustup rust-lang/rust#71292

b9938d2

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Convert more queries to use `LocalDefId` #71292

Convert more queries to use `LocalDefId` #71292

marmeladema commented Apr 18, 2020

marmeladema commented Apr 18, 2020

eddyb commented Apr 18, 2020

rust-timer commented Apr 18, 2020

bors commented Apr 18, 2020

bors commented Apr 18, 2020

rust-timer commented Apr 18, 2020

bors commented Apr 19, 2020

bors commented Apr 23, 2020

bors commented Apr 23, 2020

marmeladema commented Apr 24, 2020

eddyb commented Apr 27, 2020

bors commented Apr 27, 2020

marmeladema commented Apr 27, 2020

Dylan-DPC-zz commented Apr 27, 2020

bors commented Apr 27, 2020

bors commented Apr 28, 2020

bors commented Apr 28, 2020

rust-highfive commented Apr 28, 2020

marmeladema commented Apr 28, 2020

RalfJung commented Apr 28, 2020

RalfJung Apr 28, 2020

oli-obk Apr 28, 2020

oli-obk Apr 28, 2020

RalfJung Apr 28, 2020

marmeladema Apr 28, 2020

marmeladema Apr 28, 2020

RalfJung Apr 28, 2020

eddyb Apr 28, 2020

eddyb Apr 28, 2020

Convert more queries to use LocalDefId #71292

Convert more queries to use LocalDefId #71292

Conversation

marmeladema commented Apr 18, 2020

marmeladema commented Apr 18, 2020

eddyb commented Apr 18, 2020

rust-timer commented Apr 18, 2020

bors commented Apr 18, 2020

bors commented Apr 18, 2020

rust-timer commented Apr 18, 2020

bors commented Apr 19, 2020

bors commented Apr 23, 2020

bors commented Apr 23, 2020

marmeladema commented Apr 24, 2020

eddyb commented Apr 27, 2020

bors commented Apr 27, 2020

marmeladema commented Apr 27, 2020

Dylan-DPC-zz commented Apr 27, 2020

bors commented Apr 27, 2020

bors commented Apr 28, 2020

bors commented Apr 28, 2020

rust-highfive commented Apr 28, 2020

marmeladema commented Apr 28, 2020

RalfJung commented Apr 28, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Convert more queries to use `LocalDefId` #71292

Convert more queries to use `LocalDefId` #71292