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.

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

Erase late bound regions from Instance::fn_sig() and add a few more details to StableMIR APIs #118927

Merged
merged 4 commits into from Dec 15, 2023

Conversation

celinval
Copy link
Contributor

@celinval celinval commented Dec 14, 2023

The Instance fn_sig() still included a late bound regions which needed a new compiler function in order to be erased. I've also bundled the following small fixes in this PR, let me know if you want me to isolate any of them.

  • Add missing CoroutineKind::AsyncGen.
  • Add optional spread argument to function body which is needed to properly analyze compiler shims.
  • Add a utility method to iterate over all locals together with their declaration.
  • Add a method to get the description of AssertMessage*.
  • For the last one, we could consider eventually calling the internal AssertKind::description() to avoid code duplication. However, we still don't have ways to convert AssertMessage, Operand, Place and others, in order to use that. The other downside of using the internal method is that it will panic for some of the variants.

r ? @ouz-a

@rustbot
Copy link
Collaborator

rustbot commented Dec 14, 2023

r? @ouz-a

(rustbot has picked a reviewer for you, use r? to override)

@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 Dec 14, 2023
@rustbot
Copy link
Collaborator

rustbot commented Dec 14, 2023

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino, @ouz-a

compiler/stable_mir/src/compiler_interface.rs Outdated Show resolved Hide resolved
compiler/stable_mir/src/mir/body.rs Show resolved Hide resolved
compiler/stable_mir/src/ty.rs Outdated Show resolved Hide resolved
compiler/rustc_smir/src/rustc_smir/context.rs Show resolved Hide resolved
- Remove `fn_sig()` from Instance.
- Change return value of `AssertMessage::description` to `Cow<>`.
- Add assert to instance `ty()`.
- Generalize uint / int type creation.
Copy link
Member

@compiler-errors compiler-errors left a comment

Choose a reason for hiding this comment

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

r=me

compiler/stable_mir/src/mir/body.rs Show resolved Hide resolved
@ouz-a ouz-a assigned compiler-errors and celinval and unassigned ouz-a and celinval Dec 15, 2023
@celinval
Copy link
Contributor Author

@bors r=@compiler-errors rollup

@bors
Copy link
Contributor

bors commented Dec 15, 2023

📌 Commit 6004386 has been approved by compiler-errors

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 Dec 15, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 15, 2023
Rollup of 2 pull requests

Successful merges:

 - rust-lang#118927 (Erase late bound regions from `Instance::fn_sig()` and add a few more details to StableMIR APIs)
 - rust-lang#118964 (Opportunistically resolve region var in canonicalizer (instead of resolving root var))

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 578758a into rust-lang:master Dec 15, 2023
11 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Dec 15, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 15, 2023
Rollup merge of rust-lang#118927 - celinval:smir-missing-info, r=compiler-errors

Erase late bound regions from `Instance::fn_sig()` and add a few more details to StableMIR APIs

The Instance `fn_sig()` still included a late bound regions which needed a new compiler function in order to be erased. I've also bundled the following small fixes in this PR, let me know if you want me to isolate any of them.

  - Add missing `CoroutineKind::AsyncGen`.
  - Add optional spread argument to function body which is needed to properly analyze compiler shims.
  - Add a utility method to iterate over all locals together with their declaration.
  - Add a method to get the description of `AssertMessage`*.

* For the last one, we could consider eventually calling the internal `AssertKind::description()` to avoid code duplication. However, we still don't have ways to convert `AssertMessage`, `Operand`, `Place` and others, in order to use that. The other downside of using the internal method is that it will panic for some of the variants.

r ? `@ouz-a`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

None yet

5 participants