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.

Sign up for GitHub

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

Jump to bottom

Make sure tcx.create_def also depends on the forever red node, instead of just tcx.at(span).create_def #121084

Merged
merged 2 commits into from
Feb 15, 2024
Merged

Make sure tcx.create_def also depends on the forever red node, instead of just tcx.at(span).create_def #121084

merged 2 commits into from
Feb 15, 2024

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Feb 14, 2024

oversight from #119136

Not actually an issue, because all uses of tcx.create_def were in the resolver, which is eval_always, but still good to harden against future uses of create_def

cc @petrochenkov @WaffleLapkin

@rustbot
Copy link
Collaborator

rustbot commented Feb 14, 2024

r? @lcnr

rustbot has assigned @lcnr.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot 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 Feb 14, 2024
@WaffleLapkin
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 14, 2024

📌 Commit 2e900ed has been approved by WaffleLapkin

It is now in the queue for this repository.

@bors 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 Feb 14, 2024
@WaffleLapkin WaffleLapkin assigned WaffleLapkin and unassigned lcnr Feb 14, 2024
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Feb 14, 2024
@GuillaumeGomez
Rollup merge of rust-lang#121084 - oli-obk:create_def_forever_red2, r…
2062325 
…=WaffleLapkin

Make sure `tcx.create_def` also depends on the forever red node, instead of just `tcx.at(span).create_def`

oversight from rust-lang#119136

Not actually an issue, because all uses of `tcx.create_def` were in the resolver, which is `eval_always`, but still good to harden against future uses of `create_def`

cc `@petrochenkov` `@WaffleLapkin`
@GuillaumeGomez GuillaumeGomez mentioned this pull request Feb 14, 2024
Merged
petrochenkov
petrochenkov reviewed Feb 14, 2024
View reviewed changes
compiler/rustc_middle/src/ty/context.rs
// Depending on the forever-red node will tell the graph that the calling query
// needs to be re-evaluated.
self.dep_graph.read_index(DepNodeIndex::FOREVER_RED_NODE);

// The following call has the side effect of modifying the tables inside `definitions`.
Copy link
Contributor

Choose a reason for hiding this comment

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

This comment looks related to the moved code, and also outdated.
It should probably be updated and maybe also moved.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done 😆 I already had the commit ready

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 14, 2024
@bors
Auto merge of rust-lang#121086 - GuillaumeGomez:rollup-y82fs9y, r=Gui…
502ce82 
…llaumeGomez

Rollup of 6 pull requests

Successful merges:

 - rust-lang#120893 (Move some tests)
 - rust-lang#120966 (Remove importing suggestions when there is a shadowed typo candidate)
 - rust-lang#121035 (Format `async` trait bounds in rustfmt)
 - rust-lang#121075 (Fix false positive with if let and ranges)
 - rust-lang#121083 (Extend documentation for `Ty::to_opt_closure_kind` method)
 - rust-lang#121084 (Make sure `tcx.create_def` also depends on the forever red node, instead of just `tcx.at(span).create_def`)

r? `@ghost`
`@rustbot` modify labels: rollup
@oli-obk
Copy link
Contributor Author

oli-obk commented Feb 14, 2024

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 14, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 14, 2024
@rust-timer
Unrolled build for rust-lang#121084
bd8c961 
Rollup merge of rust-lang#121084 - oli-obk:create_def_forever_red2, r=WaffleLapkin

Make sure `tcx.create_def` also depends on the forever red node, instead of just `tcx.at(span).create_def`

oversight from rust-lang#119136

Not actually an issue, because all uses of `tcx.create_def` were in the resolver, which is `eval_always`, but still good to harden against future uses of `create_def`

cc `@petrochenkov` `@WaffleLapkin`
@klensy
Copy link
Contributor

klensy commented Feb 14, 2024 •
edited
Loading

Was merged in #121086 (at least first commit)

@oli-obk oli-obk mentioned this pull request Feb 14, 2024
Merged
@oli-obk
Copy link
Contributor Author

oli-obk commented Feb 14, 2024

whoops

@rustbot review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 14, 2024
@WaffleLapkin
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Feb 14, 2024

📌 Commit 55f9aed has been approved by WaffleLapkin

It is now in the queue for this repository.

@bors 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 Feb 14, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 15, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 15, 2024
@bors
Auto merge of rust-lang#121131 - matthiaskrgr:rollup-mo3b8nz, r=matth…
4ae1e79 
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#111106 (Add known issue of let binding to format_args doc)
 - rust-lang#118749 (Make contributing to windows bindings easier)
 - rust-lang#120982 (Add APIs for fetching foreign items )
 - rust-lang#121022 (rustdoc: cross-crate re-exports: correctly render late-bound params in source order even if early-bound params are present)
 - rust-lang#121082 (Clarified docs on non-atomic oprations on owned/mut refs to atomics)
 - rust-lang#121084 (Make sure `tcx.create_def` also depends on the forever red node, instead of just `tcx.at(span).create_def`)
 - rust-lang#121098 (Remove unnecessary else block from `thread_local!` expanded code)
 - rust-lang#121105 (Do not report overflow errors on ConstArgHasType goals)
 - rust-lang#121116 (Reinstate some delayed bugs.)
 - rust-lang#121122 (Enforce coroutine-closure layouts are identical)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f62d981 into rust-lang:master Feb 15, 2024
11 checks passed
@rustbot rustbot added this to the 1.78.0 milestone Feb 15, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 15, 2024
@rust-timer
Unrolled build for rust-lang#121084
a604466 
Rollup merge of rust-lang#121084 - oli-obk:create_def_forever_red2, r=WaffleLapkin

Make sure `tcx.create_def` also depends on the forever red node, instead of just `tcx.at(span).create_def`

oversight from rust-lang#119136

Not actually an issue, because all uses of `tcx.create_def` were in the resolver, which is `eval_always`, but still good to harden against future uses of `create_def`

cc `@petrochenkov` `@WaffleLapkin`
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 19, 2024
@bors
Auto merge of rust-lang#121089 - oli-obk:create_def_feed, r=cjgillot
5bffa10 
Remove `feed_local_def_id`

best reviewed commit by commit

Basically I returned `TyCtxtFeed` from `create_def` and then preserved that in the local caches

based on rust-lang#121084

r? `@petrochenkov`
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 19, 2024
@bors
Auto merge of rust-lang#121089 - oli-obk:create_def_feed, r=<try>
9b35aff 
Remove `feed_local_def_id`

best reviewed commit by commit

Basically I returned `TyCtxtFeed` from `create_def` and then preserved that in the local caches

based on rust-lang#121084

r? `@petrochenkov`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 6, 2024
@matthiaskrgr
Rollup merge of rust-lang#121089 - oli-obk:create_def_feed, r=petroch…
ce7a19d 
…enkov

Remove `feed_local_def_id`

best reviewed commit by commit

Basically I returned `TyCtxtFeed` from `create_def` and then preserved that in the local caches

based on rust-lang#121084

r? `@petrochenkov`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 6, 2024
@matthiaskrgr
Rollup merge of rust-lang#121089 - oli-obk:create_def_feed, r=petroch…
21f1101 
…enkov

Remove `feed_local_def_id`

best reviewed commit by commit

Basically I returned `TyCtxtFeed` from `create_def` and then preserved that in the local caches

based on rust-lang#121084

r? ``@petrochenkov``
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Mar 7, 2024
@workingjubilee
Rollup merge of rust-lang#121089 - oli-obk:create_def_feed, r=petroch…
5171011 
…enkov

Remove `feed_local_def_id`

best reviewed commit by commit

Basically I returned `TyCtxtFeed` from `create_def` and then preserved that in the local caches

based on rust-lang#121084

r? ```@petrochenkov```
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Mar 7, 2024
@GuillaumeGomez
Rollup merge of rust-lang#121089 - oli-obk:create_def_feed, r=petroch…
4de78d2 
…enkov

Remove `feed_local_def_id`

best reviewed commit by commit

Basically I returned `TyCtxtFeed` from `create_def` and then preserved that in the local caches

based on rust-lang#121084

r? ````@petrochenkov````
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 8, 2024
@rust-timer
Unrolled build for rust-lang#121089
e9ddc23 
Rollup merge of rust-lang#121089 - oli-obk:create_def_feed, r=petrochenkov

Remove `feed_local_def_id`

best reviewed commit by commit

Basically I returned `TyCtxtFeed` from `create_def` and then preserved that in the local caches

based on rust-lang#121084

r? ````@petrochenkov````
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

@WaffleLapkin WaffleLapkin WaffleLapkin approved these changes

Assignees

@WaffleLapkin WaffleLapkin

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
query feeding
Status: Done
Milestone
1.78.0
Development

Successfully merging this pull request may close these issues.
7 participants
@oli-obk @rustbot @WaffleLapkin @bors @klensy @petrochenkov @lcnr