Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Call terminator to SMIR #110558

Merged
merged 1 commit into from
Apr 20, 2023
Merged

Add Call terminator to SMIR #110558

merged 1 commit into from
Apr 20, 2023

Conversation

spastorino
Copy link
Member

@spastorino spastorino commented Apr 19, 2023 •
edited
Loading

This adds internal MIR TerminatorKind::Call to SMIR Terminator::Call conversion.

r? @oli-obk

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Apr 19, 2023
@rustbot
Copy link
Collaborator

rustbot commented Apr 19, 2023

This PR changes Stable MIR

cc @oli-obk, @celinval

oli-obk
oli-obk reviewed Apr 20, 2023
View reviewed changes
compiler/rustc_smir/src/rustc_smir/mod.rs Outdated
Comment on lines 161 to 164
cleanup: match unwind {
UnwindAction::Cleanup(bb) => Some(bb.as_usize()),
_ => None,
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably copy the UnwindAction enum to smir instead of losing the information about which behaviour is desired here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed, made the change but only applied to Call. We would need to apply to Assert, etc but we can do that as we go I guess.

@spastorino spastorino force-pushed the smir-call-terminator branch from 1f14eda to 2f50334 Compare April 20, 2023 15:07
@oli-obk
Copy link
Contributor

oli-obk commented Apr 20, 2023

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 20, 2023

📌 Commit 2f50334 has been approved by oli-obk

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 20, 2023
@spastorino spastorino mentioned this pull request Apr 20, 2023
Merged
@matthiaskrgr matthiaskrgr mentioned this pull request Apr 20, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 20, 2023
@bors
Auto merge of rust-lang#110612 - matthiaskrgr:rollup-y2hbjws, r=matth…
3d7a091 
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#108795 (Add support for the x86_64h-apple-darwin target)
 - rust-lang#110558 (Add Call terminator to SMIR)
 - rust-lang#110565 (linkchecker: running from a directory separate from the book)
 - rust-lang#110599 (Remove an unused `&[Ty]` <-> `&[GenericArg]`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4624616 into rust-lang:master Apr 20, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oli-obk oli-obk oli-obk left review comments

Assignees

@oli-obk oli-obk

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.71.0
Development

Successfully merging this pull request may close these issues.
4 participants
@spastorino @rustbot @oli-obk @bors