Add ADT variant infomation to StableMIR and finish implementing TyKind::internal()#118516

celinval · 2023-12-01T21:20:56Z

Introduce a VariantDef type and a mechanism to retrieve the definition from an AdtDef.

The VariantDef representation itself is just a combination of AdtDef and VariantIdx, which allow us to retrieve further information of a variant. I don't think we need to cache extra information for now, and we can translate on an on demand manner. I am leaving the fields public today due to rust-lang/project-stable-mir#56, but they shouldn't. For this PR, I've only added a method to retrieve the variant name, and its fields. I also added an implementation of RustcInternal that allow users to retrieve more information using Rust internal APIs.

I have also finished the implementation of RustcInternal for TyKind which fixes rust-lang/project-stable-mir#46.

Motivation

Both of these changes are needed in order to properly interpret things like projections. For example,

The variant definition is used to find out which variant we are downcasting to.
Being able to create Ty from TyKind helps for example processing each stage of a projection, like the code in place.ty().

rustbot · 2023-12-01T21:21:04Z

r? @spastorino

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

rustbot · 2023-12-01T21:21:06Z

This PR changes Stable MIR

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

bors · 2023-12-02T19:00:51Z

☔ The latest upstream changes (presumably #118543) made this pull request unmergeable. Please resolve the merge conflicts.

compiler/stable_mir/src/mir/body.rs

This will allow us to provide methods to create `Ty` inside the stable MIR, which can be helpful while handling pointers and other stuff.

celinval · 2023-12-04T19:06:17Z

r? @ouz-a

Do you think you can take a look at this one too? I don't know if @spastorino will have time.

ouz-a · 2023-12-04T19:40:30Z

Will try to review this week.

ouz-a

Overall looks very good, I'm happy that you provided very detailed documentation, and have a clear goal with this PR. just left a nit and a comment.

compiler/rustc_smir/src/rustc_internal/internal.rs

compiler/rustc_smir/src/rustc_smir/context.rs

Although, we would like to avoid crashes whenever possible, and that's why I wanted to make this API fallible. It's looking pretty hard to do proper validation. I think many of our APIs will unfortunately depend on the user doing the correct thing since at the MIR level we are working on, we expect types to have been checked already.

ouz-a · 2023-12-05T20:41:39Z

r=me when green

celinval · 2023-12-05T20:44:37Z

@bors r=@ouz-a

@bors rollup

bors · 2023-12-05T20:44:39Z

📌 Commit 326fea0 has been approved by ouz-a

It is now in the queue for this repository.

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#116496 (Provide context when `?` can't be called because of `Result<_, E>`) - rust-lang#117563 (docs: clarify explicitly freeing heap allocated memory) - rust-lang#117874 (`riscv32` platform support) - rust-lang#118516 (Add ADT variant infomation to StableMIR and finish implementing TyKind::internal()) - rust-lang#118650 (add comment about keeping flags in sync between bootstrap.py and bootstrap.rs) - rust-lang#118664 (docs: remove rust-lang#110800 from release notes) - rust-lang#118669 (library: fix comment about const assert in win api) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#118516 - celinval:smir-variants, r=ouz-a Add ADT variant infomation to StableMIR and finish implementing TyKind::internal() Introduce a `VariantDef` type and a mechanism to retrieve the definition from an `AdtDef`. The `VariantDef` representation itself is just a combination of `AdtDef` and `VariantIdx`, which allow us to retrieve further information of a variant. I don't think we need to cache extra information for now, and we can translate on an on demand manner. I am leaving the fields public today due to rust-lang/project-stable-mir#56, but they shouldn't. For this PR, I've only added a method to retrieve the variant name, and its fields. I also added an implementation of `RustcInternal` that allow users to retrieve more information using Rust internal APIs. I have also finished the implementation of `RustcInternal` for `TyKind` which fixes rust-lang/project-stable-mir#46. ## Motivation Both of these changes are needed in order to properly interpret things like projections. For example, - The variant definition is used to find out which variant we are downcasting to. - Being able to create `Ty` from `TyKind` helps for example processing each stage of a projection, like the code in `place.ty()`.

The main changes needed to make this migration besides a few method call tweaks were: 1. Adapt `FunctionCtx` to cache information about the StableMIR version of instance and its body. - I also cleaned up how we were handling basic blocks which were unnecessary. 2. Created a new ty_stable module that provide stable versions to retrieve type information from StableMIR. - I decided to keep these separate so it is cleaner for now. I foresee that the type module will still rely on internal APIs for the next little while, so separating them here made sense to me. 3. Since `Place` when retrieved from StableMIR body already comes monomorphized, I modified the existing `codegen_place` to preemptively monomorphize Place before converting it to a Stable version and invoking `codegen_place_stable`. ### Call-outs Leaving this as a draft for now since this still depends on the following PRs to be merged into the Rust compiler: - rust-lang/rust#118524 - rust-lang/rust#118516 --------- Co-authored-by: Adrian Palacios <73246657+adpaco-aws@users.noreply.github.com>

rustbot assigned spastorino Dec 1, 2023

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 1, 2023

celinval mentioned this pull request Dec 2, 2023

Migrate hooks and place modules to use mostly StableMIR APIs model-checking/kani#2910

Merged

ghost reviewed Dec 2, 2023

View reviewed changes

compiler/stable_mir/src/mir/body.rs Outdated Show resolved Hide resolved

Add Variant and a few more APIs to stable_mir

efaf425

celinval force-pushed the smir-variants branch from 07ef379 to f8d4a62 Compare December 4, 2023 19:04

Finish implementing RustcInternal for TyKind

e19c7cd

This will allow us to provide methods to create `Ty` inside the stable MIR, which can be helpful while handling pointers and other stuff.

celinval force-pushed the smir-variants branch from f8d4a62 to e19c7cd Compare December 4, 2023 19:05

rustbot assigned ouz-a and unassigned spastorino Dec 4, 2023

Add FieldDef to StableMIR and methods to get type

1720b10

ouz-a suggested changes Dec 5, 2023

View reviewed changes

compiler/rustc_smir/src/rustc_internal/internal.rs Show resolved Hide resolved

compiler/rustc_smir/src/rustc_smir/context.rs Outdated Show resolved Hide resolved

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 5, 2023

ouz-a approved these changes Dec 5, 2023

View reviewed changes

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 5, 2023

matthiaskrgr mentioned this pull request Dec 6, 2023

Rollup of 7 pull requests #118679

Merged

bors merged commit 67d8999 into rust-lang:master Dec 6, 2023

rustbot added this to the 1.76.0 milestone Dec 6, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add ADT variant infomation to StableMIR and finish implementing TyKind::internal()#118516