smir: merge identical Constant and ConstOperand types #126410
Merged
Conversation
This file contains 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
This comment has been minimized.
This comment has been minimized.
RalfJung
force-pushed
the
smir-const-operand
branch
from
3b3f46b
to
dcee529
Compare
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 15, 2024
…llaumeGomez Rollup of 9 pull requests Successful merges: - rust-lang#126229 (Bump windows-bindgen to 0.57) - rust-lang#126404 (Check that alias-relate terms are WF if reporting an error in alias-relate) - rust-lang#126410 (smir: merge identical Constant and ConstOperand types) - rust-lang#126478 (Migrate `run-make/codegen-options-parsing` to `rmake.rs`) - rust-lang#126496 (Make proof tree probing and `Candidate`/`CandidateSource` generic over interner) - rust-lang#126508 (Make uninitialized_error_reported a set of locals) - rust-lang#126517 (Migrate `run-make/dep-graph` to `rmake.rs`) - rust-lang#126525 (trait_selection: remove extra words) - rust-lang#126526 (tests/ui/lint: Move 19 tests to new `non-snake-case` subdir) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 15, 2024
Rollup merge of rust-lang#126410 - RalfJung:smir-const-operand, r=oli-obk smir: merge identical Constant and ConstOperand types The first commit renames the const operand visitor functions on regular MIR to match the type name, that was forgotten in the original rename. The second commit changes stable MIR, fixing rust-lang/project-stable-mir#71. Previously there were two different smir types for the MIR type `ConstOperand`, one used in `Operand` and one in `VarDebugInfoContents`. Maybe we should have done this with rust-lang#125967, so there's only a single breaking change... but I saw that PR too late. Fixes rust-lang/project-stable-mir#71
celinval
added a commit
to celinval/kani-dev
that referenced
this pull request
Jun 17, 2024
Related changes: - rust-lang/rust#125910: Introduces a new constant propagation pass which broke Kani coverage tests. For now, disable this pass if coverage is enabled. - rust-lang/rust#126410: Rename ConstOperands
celinval
added a commit
to model-checking/kani
that referenced
this pull request
Jun 17, 2024
Related changes: - rust-lang/rust#125910: Introduces a new constant propagation pass which broke Kani coverage tests. For now, disable this pass if coverage is enabled. - rust-lang/rust#126410: Rename ConstOperands Resolves #3260
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.
The first commit renames the const operand visitor functions on regular MIR to match the type name, that was forgotten in the original rename.
The second commit changes stable MIR, fixing rust-lang/project-stable-mir#71. Previously there were two different smir types for the MIR type
ConstOperand, one used inOperandand one inVarDebugInfoContents.Maybe we should have done this with #125967, so there's only a single breaking change... but I saw that PR too late.
Fixes rust-lang/project-stable-mir#71