Skip to content

Add Call terminator to SMIR - #110558

Merged
bors merged 1 commit into
rust-lang:masterfrom
spastorino:smir-call-terminator
Apr 20, 2023
Merged

Add Call terminator to SMIR#110558
bors merged 1 commit into
rust-lang:masterfrom
spastorino:smir-call-terminator

Conversation

@spastorino

@spastorinospastorino commented Apr 19, 2023

Copy link
Copy Markdown
Member

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

r? @oli-obk

@rustbotrustbot 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
Copy Markdown
Collaborator

This PR changes Stable MIR

cc @oli-obk, @celinval

Comment on lines 161 to 164

Copy link
Copy Markdown
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
Copy Markdown
MemberAuthor

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
spastorinoforce-pushed the smir-call-terminator branch from 1f14eda to 2f50334CompareApril 20, 2023 15:07
@oli-obk

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Apr 20, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 2f50334 has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 20, 2023
…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:masterApr 20, 2023
@rustbotrustbot added this to the 1.71.0 milestone Apr 20, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@spastorino@rustbot@oli-obk@bors