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

Add VarDebugInfo to Stable MIR #117972

Merged
merged 2 commits into from
Nov 22, 2023
Merged

Add VarDebugInfo to Stable MIR #117972

merged 2 commits into from
Nov 22, 2023

Conversation

ouz-a
Copy link
Contributor

@ouz-a ouz-a commented Nov 16, 2023

Previously we omitted VarDebugInfo because we didn't have Projection now that #117517 is merged it's possible to add VarDebugInfo information in Body. This PR adds stable version of the VarDebugInfo to Body

r? @celinval

@rustbot
Copy link
Collaborator

rustbot commented Nov 16, 2023

Failed to set assignee to celinval: invalid assignee

Note: Only org members with at least the repository "read" role, users with write permissions, or people who have commented on the PR may be assigned.

@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 Nov 16, 2023
@rustbot
Copy link
Collaborator

rustbot commented Nov 16, 2023

This PR changes Stable MIR

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

@celinval
Copy link
Contributor

r? celinval

I created rust-lang/team#1119 to hopefully fix the assignment.

Copy link
Contributor

@celinval celinval left a comment

Choose a reason for hiding this comment

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

Looks good! Thanks

compiler/rustc_smir/src/rustc_smir/mod.rs Outdated Show resolved Hide resolved
compiler/stable_mir/src/mir/visit.rs Show resolved Hide resolved
@bors
Copy link
Contributor

bors commented Nov 18, 2023

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

@celinval
Copy link
Contributor

celinval commented Nov 18, 2023

@bors r+ rollup

Awesome! Thanks

@ouz-a
Copy link
Contributor Author

ouz-a commented Nov 20, 2023

I don't think that worked 😅

@celinval
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 20, 2023

📌 Commit 965f46b has been approved by celinval

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 Nov 20, 2023
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Nov 21, 2023
Add VarDebugInfo to Stable MIR

Previously we omitted `VarDebugInfo` because we didn't have `Projection` now that rust-lang#117517 is merged it's possible to add `VarDebugInfo` information in `Body`. This PR adds stable version of the `VarDebugInfo` to `Body`

r? `@celinval`
@bors
Copy link
Contributor

bors commented Nov 21, 2023

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

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 21, 2023
@celinval
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 21, 2023

📌 Commit d0dd19a has been approved by celinval

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 21, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 21, 2023
Add VarDebugInfo to Stable MIR

Previously we omitted `VarDebugInfo` because we didn't have `Projection` now that rust-lang#117517 is merged it's possible to add `VarDebugInfo` information in `Body`. This PR adds stable version of the `VarDebugInfo` to `Body`

r? `@celinval`
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 21, 2023
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#117972 (Add VarDebugInfo to Stable MIR)
 - rust-lang#118110 (Document `DefiningAnchor` a bit more)
 - rust-lang#118112 (Don't ICE when ambiguity is found when selecting `Index` implementation in typeck)
 - rust-lang#118135 (Remove quotation from filename in stable_mir)

Failed merges:

 - rust-lang#118012 (Add support for global allocation in smir)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 21, 2023
Add VarDebugInfo to Stable MIR

Previously we omitted `VarDebugInfo` because we didn't have `Projection` now that rust-lang#117517 is merged it's possible to add `VarDebugInfo` information in `Body`. This PR adds stable version of the `VarDebugInfo` to `Body`

r? ``@celinval``
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 22, 2023
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#117972 (Add VarDebugInfo to Stable MIR)
 - rust-lang#118109 (rustdoc-search: simplify `checkPath` and `sortResults`)
 - rust-lang#118110 (Document `DefiningAnchor` a bit more)
 - rust-lang#118112 (Don't ICE when ambiguity is found when selecting `Index` implementation in typeck)
 - rust-lang#118135 (Remove quotation from filename in stable_mir)

Failed merges:

 - rust-lang#118012 (Add support for global allocation in smir)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a98698e into rust-lang:master Nov 22, 2023
11 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Nov 22, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 22, 2023
Rollup merge of rust-lang#117972 - ouz-a:stable_debuginfo, r=celinval

Add VarDebugInfo to Stable MIR

Previously we omitted `VarDebugInfo` because we didn't have `Projection` now that rust-lang#117517 is merged it's possible to add `VarDebugInfo` information in `Body`. This PR adds stable version of the `VarDebugInfo` to `Body`

r? ```@celinval```
@ouz-a ouz-a deleted the stable_debuginfo branch November 22, 2023 08:30
}

#[derive(Clone, Debug, Eq, PartialEq)]
pub struct ConstOperand {
Copy link
Member

Choose a reason for hiding this comment

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

This adds ConstOperand even though Constant already exists -- but those are the same type! In rustc itself, mir::Constant got renamed to mir::ConstOperand, smir just never followed suit.

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.

5 participants