rust/compiler/rustc_query_impl/src/plumbing.rs, branch 1.88.0 https://github.com/rust-lang/rust http://git.dreamy.place/mirrors/rust/atom?h=1.88.0 2025-05-01T04:11:52+00:00 Auto merge of #140145 - Zoxc:job-server-proxy, r=SparrowLii 2025-05-01T04:11:52+00:00 bors bors@rust-lang.org 2025-05-01T04:11:52+00:00 urn:sha1:6e23095adf9209614a45f7f75fea36dad7b92afb Add a jobserver proxy to ensure at least one token is always held This adds a jobserver proxy to ensure at least one token is always held by `rustc`. Currently with `-Z threads` `rustc` can temporarily give up all its tokens, causing `cargo` to spawn additional `rustc` instances beyond the job limit. The current behavior causes an issue with `cargo fix` which has a global lock preventing concurrent `rustc` instances, but it also holds a jobserver token, causing a deadlock when `rustc` gives up its token. That is fixed by this PR. Fixes https://github.com/rust-lang/rust/issues/67385. Fixes https://github.com/rust-lang/rust/issues/133873. Fixes https://github.com/rust-lang/rust/issues/140093. Reformat parameters to macros used by with-all-queries 2025-04-29T10:48:51+00:00 Zalathar Zalathar@users.noreply.github.com 2025-04-29T07:31:05+00:00 urn:sha1:ed2f4b6d2dd0bc5023223cf4a61c14b2b811f9cd Rename `rustc_query_append!` to `rustc_with_all_queries!` 2025-04-29T10:48:51+00:00 Zalathar Zalathar@users.noreply.github.com 2025-04-29T07:55:17+00:00 urn:sha1:64bcf3b9f66e9bc070e2d1b1ee7e643ba098f880 Add a jobserver proxy to ensure at least one token is always held 2025-04-29T05:20:13+00:00 John Kåre Alsaker john.kare.alsaker@gmail.com 2025-04-22T05:02:27+00:00 urn:sha1:cff9efde748b6027fe9f135ddd5aaf8a3276601d Add a dep kind for use of the anon node with zero dependencies 2025-04-02T05:35:05+00:00 John Kåre Alsaker john.kare.alsaker@gmail.com 2025-04-02T05:35:05+00:00 urn:sha1:927ad1659ab4c918a4f41aef71cc8847a5198326 Use a function to create `QueryStackDeferred` to ensure context is Copy 2025-03-26T12:09:36+00:00 John Kåre Alsaker john.kare.alsaker@gmail.com 2025-03-26T12:04:06+00:00 urn:sha1:6ca2af6434ec40ae91207628722fe6e731f6f358 Avoiding calling queries when collecting active queries 2025-03-26T08:36:36+00:00 John Kåre Alsaker john.kare.alsaker@gmail.com 2025-03-18T16:01:14+00:00 urn:sha1:6319bb38ccb316b193e35720c9df953e5ab01c22 Rollup merge of #138581 - Zoxc:abort-handler-if-locked, r=SparrowLii 2025-03-25T17:09:05+00:00 Matthias Krüger 476013+matthiaskrgr@users.noreply.github.com 2025-03-25T17:09:05+00:00 urn:sha1:43297ffc22ae4c053dc9904cd8a2cb0fde1198a9 Abort in deadlock handler if we fail to get a query map Resolving query cycles requires the complete active query map, or it may miss query cycles. We did not check that the map is completely constructed before. If there is some error collecting the map, something has gone wrong already. This adds a check to abort/panic if we fail to construct the complete map. This can help differentiate errors from the `deadlock detected` case if constructing query map has errors in practice. An `Option` is not used for `collect_active_jobs` as the panic handler can still make use of a partial map. Address comments 2025-03-21T07:14:27+00:00 John Kåre Alsaker john.kare.alsaker@gmail.com 2025-03-21T07:09:42+00:00 urn:sha1:34244c1477e4b485c51872fc3c6d846b4a3c6ffa Update comments 2025-03-21T06:37:56+00:00 John Kåre Alsaker john.kare.alsaker@gmail.com 2025-03-18T13:36:28+00:00 urn:sha1:157008d7117ec9ca13b70c38058639524437112f