custom_mir: change Call() terminator syntax to something more readable #115000
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
|
The Miri subtree was changed cc @rust-lang/miri |
This comment has been minimized.
This comment has been minimized.
RalfJung
force-pushed
the
custom-mir-call
branch
from
51b5b03
to
3e4d907
Compare
compiler-errors
approved these changes
Aug 19, 2023
RalfJung
force-pushed
the
custom-mir-call
branch
from
3e4d907
to
3c6447c
Compare
|
📌 Commit 3c6447ca83a45c9b113dc31a2ddb5323f0767260 has been approved by It is now in the queue for this repository. |
bors
added
S-waiting-on-bors
JakobDegen
approved these changes
Aug 19, 2023
library/core/src/intrinsics/mir.rs
Outdated
| @@ -275,7 +276,7 @@ define!("mir_return", fn Return() -> BasicBlock); | |||
| define!("mir_goto", fn Goto(destination: BasicBlock) -> BasicBlock); | |||
| define!("mir_unreachable", fn Unreachable() -> BasicBlock); | |||
| define!("mir_drop", fn Drop<T>(place: T, goto: BasicBlock)); | |||
| define!("mir_call", fn Call<T>(place: T, goto: BasicBlock, call: T)); | |||
| define!("mir_call", fn Call<T>(call: T, goto: BasicBlock)); | |||
There was a problem hiding this comment.
The type of the first argument should be () I believe
There was a problem hiding this comment.
Ah right, I forgot that assignments have type () in Rust.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
|
@bors r- |
bors
added
S-waiting-on-author
RalfJung
force-pushed
the
custom-mir-call
branch
from
3c6447c
to
7a63466
Compare
|
@bors r=compiler-errors,JakobDegen |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 20, 2023
…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#114834 (Avoid side-effects from `try_coerce` when suggesting borrowing LHS of cast) - rust-lang#114968 (Fix UB in `std::sys::os::getenv()`) - rust-lang#114976 (Ignore unexpected incr-comp session dirs) - rust-lang#114999 (Migrate GUI colors test to original CSS color format) - rust-lang#115000 (custom_mir: change Call() terminator syntax to something more readable) 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.
I find our current syntax very hard to read -- I cannot even remember the order of arguments, and having the "next block" before the actual function call is very counter-intuitive IMO. So I suggest we use
Call(ret_val = function(v), next_block)instead.r? @JakobDegen