Rollup of 10 pull requests#154289
Conversation
add another candidate preference reason
This updates the rust-version file to 1e21831.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@1e21831 Filtered ref: rust-lang/rustc-dev-guide@e59b1dd Upstream diff: rust-lang/rust@eda4fc7...1e21831 This merge was created using https://github.com/rust-lang/josh-sync.
Rustc pull update
This updates the rust-version file to 91021cc.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@91021cc Filtered ref: rust-lang/rustc-dev-guide@3ea5559 Upstream diff: rust-lang/rust@1e21831...91021cc This merge was created using https://github.com/rust-lang/josh-sync.
Rustc pull update
These methods are just wrappers around the intrinsics.
This updates the rust-version file to 562dee4.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@562dee4 Filtered ref: rust-lang/rustc-dev-guide@8952854 Upstream diff: rust-lang/rust@91021cc...562dee4 This merge was created using https://github.com/rust-lang/josh-sync.
Rustc pull update
…-march-2026 Updated dates
This assertion and its comment are much visually heavier than the part of the function that actually performs important work. This assertion is also useless, because the `codegen_unit` query does not have a `force_from_dep_node_fn` in its DepKindVTable, so the assertion would never be reached even in the situation it is trying to guard against. This assertion is also redundant, because we have plenty of incremental tests that fail if the corresponding calls to `tcx.ensure_ok().codegen_unit(..)` are removed.
In the serial compiler, we should never be trying to force a query node that has a cached value, because we would have already marked the node red or green when putting its value in cache. In the parallel compiler, we immediately re-check the cache while holding the state shard lock anyway, and trying to avoid that lock doesn't seem worthwhile.
The different parts of this function used to be split across different crates, but nowadays they are both in `rustc_query_impl`, so they can be combined. This commit also hoists the vtable lookup to a closure in `make_dep_kind_vtable_for_query`, to reduce the amount of code that deals with `GetQueryVTable`, and to make the inner function more consistent with other functions in `execution`.
This effectively reverses <rust-lang@4284edc>. At that time, I thought GetQueryVTable might be useful for other kinds of static lookup in the future, but after various other simplifications and cleanups that now seems less likely, and this style is more consistent with other vtable-related functions.
|
@bors r+ rollup=never p=5 |
This comment has been minimized.
This comment has been minimized.
What is this?This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.Comparing 212b0d4 (parent) -> 9df8317 (this PR) Test differencesShow 3250 test diffsStage 1
Stage 2
Additionally, 3244 doctest diffs were found. These are ignored, as they are noisy. Job group index
Test dashboardRun cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard 9df83179a4fd7ddee7532e72abb23c76b8426f9a --output-dir test-dashboardAnd then open Job duration changes
How to interpret the job duration changes?Job durations can vary a lot, based on the actual runner instance |
|
Finished benchmarking commit (9df8317): comparison URL. Overall result: ❌ regressions - please read the text belowOur benchmarks found a performance regression caused by this PR. Next Steps:
@rustbot label: +perf-regression Instruction countOur most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.
Max RSS (memory usage)Results (primary 0.3%, secondary 0.8%)A less reliable metric. May be of interest, but not used to determine the overall result above.
CyclesResults (primary -2.1%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 495.299s -> 486.263s (-1.82%) |
Successful merges:
doc_cfgnot working as expected on trait impls #153964 (Fixdoc_cfgnot working as expected on trait impls)unchecked_funnel_{shl,shr}#154153 (core: Implementunchecked_funnel_{shl,shr})OnDiskCache#154252 (Don't store current-session side effects inOnDiskCache)r? @ghost
Create a similar rollup