Dont resolve instance of root in mir_callgraph_cyclic
#143551
Merged
+129
−9
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-review
|
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt |
|
Thanks for fixing this! |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Jul 7, 2025
Rollup of 11 pull requests Successful merges: - #143130 (doc(std): clarify `NonZero<T>` usage limitation in doc comment) - #143415 (Get rid of build-powerpc64le-toolchain.sh) - #143464 (Make tests/ui/abi/debug.rs cross-compile) - #143482 (Fix short linker error output) - #143524 (Move `stable_mir` back to its own crate) - #143528 (interpret: rename StackPopCleanup) - #143551 (Dont resolve instance of root in `mir_callgraph_cyclic`) - #143558 (mbe: Refactors and function extractions in `compile_declarative_macro`) - #143563 (std: fix typo in `std::path`) - #143564 (compiler: Deduplicate `must_emit_unwind_tables()` comments) - #143577 (Disable download-rustc for library profile) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Jul 7, 2025
Rollup merge of #143551 - compiler-errors:root-sub, r=cjgillot Dont resolve instance of root in `mir_callgraph_cyclic` `Instance::try_resolve` on a default trait body method will always fail, since it's still possible to further substitute. This leads to a cycle, since in `tests/mir-opt/inline_default_trait_body.rs`, both `Trait::a` and `Trait::b` need to consider the other to be cyclical, but since we couldn't resolve a body, we'd just consider *nothing* to be cyclical. The root instance we care about when computing `mir_callgraph_cyclic` is trivial to compute (it's just `InstanceKind::Item`), so just replace it with a call to `Instance::new_raw`. r? `@cjgillot` `@oli-obk` Fixes #143534
github-actions bot
pushed a commit
to devnexen/miri
that referenced
this pull request
Jul 8, 2025
Rollup of 11 pull requests Successful merges: - rust-lang/rust#143130 (doc(std): clarify `NonZero<T>` usage limitation in doc comment) - rust-lang/rust#143415 (Get rid of build-powerpc64le-toolchain.sh) - rust-lang/rust#143464 (Make tests/ui/abi/debug.rs cross-compile) - rust-lang/rust#143482 (Fix short linker error output) - rust-lang/rust#143524 (Move `stable_mir` back to its own crate) - rust-lang/rust#143528 (interpret: rename StackPopCleanup) - rust-lang/rust#143551 (Dont resolve instance of root in `mir_callgraph_cyclic`) - rust-lang/rust#143558 (mbe: Refactors and function extractions in `compile_declarative_macro`) - rust-lang/rust#143563 (std: fix typo in `std::path`) - rust-lang/rust#143564 (compiler: Deduplicate `must_emit_unwind_tables()` comments) - rust-lang/rust#143577 (Disable download-rustc for library profile) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Instance::try_resolveon a default trait body method will always fail, since it's still possible to further substitute. This leads to a cycle, since intests/mir-opt/inline_default_trait_body.rs, bothTrait::aandTrait::bneed to consider the other to be cyclical, but since we couldn't resolve a body, we'd just consider nothing to be cyclical.The root instance we care about when computing
mir_callgraph_cyclicis trivial to compute (it's justInstanceKind::Item), so just replace it with a call toInstance::new_raw.r? @cjgillot @oli-obk
Fixes #143534