Revert "Use the HIR instead of mir_keys for determining whether something will have a MIR body." #126077
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
…hing will have a MIR body." This reverts commit e5cba17.
rustbot
added
S-waiting-on-review
|
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt |
|
Do you want to add a SMIR test in this PR? |
|
I should, but I had like 5 mins which wasn't enough to run any tests. Maybe tomorrow |
This was referenced Jun 7, 2024
BoxyUwU
reviewed
Jun 7, 2024
| @@ -33,7 +33,7 @@ fn test_stable_mir() -> ControlFlow<()> { | |||
| // Get all items and split generic vs monomorphic items. | |||
| let (generic, mono): (Vec<_>, Vec<_>) = | |||
| items.into_iter().partition(|item| item.requires_monomorphization()); | |||
| assert_eq!(mono.len(), 3, "Expected 2 mono functions and one constant"); | |||
| assert_eq!(mono.len(), 4, "Expected 2 mono functions and one constant"); | |||
There was a problem hiding this comment.
2 mono functions and one constant adds up to 3 items not 4 xd
|
@bors r=BoxyUwU |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 7, 2024
…iaskrgr Rollup of 11 pull requests Successful merges: - rust-lang#124012 (Stabilize `binary_heap_as_slice`) - rust-lang#124214 (Parse unsafe attributes) - rust-lang#125572 (Detect pub structs never constructed and unused associated constants) - rust-lang#125781 (prefer `compile::stream_cargo` for building tools) - rust-lang#126030 (Update `./x fmt` command in library/std/src/sys/pal/windows/c/README.md) - rust-lang#126047 (Simplify the rayon calls in the installer) - rust-lang#126052 (More `rustc_parse` cleanups) - rust-lang#126077 (Revert "Use the HIR instead of mir_keys for determining whether something will have a MIR body.") - rust-lang#126089 (Stabilize Option::take_if) - rust-lang#126112 (Clean up source root in run-make tests) - rust-lang#126119 (Improve docs for using custom paths with `--emit`) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 7, 2024
Rollup merge of rust-lang#126077 - oli-obk:revert_is_mir_available, r=BoxyUwU Revert "Use the HIR instead of mir_keys for determining whether something will have a MIR body." This reverts commit e5cba17. turns out SMIR still needs it (model-checking/kani#3218). I'll create a full plan and MCP for what I intended this to be a part of. Maybe my plan is nonsense anyway.
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
This reverts commit e5cba17.
turns out SMIR still needs it (model-checking/kani#3218). I'll create a full plan and MCP for what I intended this to be a part of. Maybe my plan is nonsense anyway.