Fix misc printing issues in `emit=stable_mir` #118364

ouz-a · 2023-11-27T10:40:38Z

Previously our } closed early and looked bit weird, now it closes when function call ends, and previously Adt printing was too verbose now it's similar to mir output

r? @celinval

rustbot · 2023-11-27T10:40:47Z

This PR changes Stable MIR

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

compiler-errors · 2023-11-27T14:45:03Z

I've asked before but I will ask again -- is it possible for you to prioritize working on some sort of test?

It's kinda sketchy to be putting up PRs like this with absolutely no evidence that it's doing anything.

ouz-a · 2023-11-27T14:53:31Z

I've asked before but I will ask again -- is it possible for you to prioritize working on some sort of test?

It's kinda sketchy to be putting up PRs like this with absolutely no evidence that it's doing anything.

Alright will start working on a test immediately

ouz-a · 2023-11-27T15:45:05Z

Opened PR for the test #118375

…=compiler-errors Add -Zunpretty=stable-mir output test As strongly suggested here rust-lang#118364 (comment) this adds output test for `-Zunpretty=stable-mir`, added test shows almost all the functionality of the current printer. r? `@compiler-errors`

compiler-errors · 2023-11-27T17:46:56Z

Do you mind rebasing this on top of #118375? Then you can bless the tests in your commit and see the output changes due to these tweaks.

ouz-a · 2023-11-27T18:11:27Z

Do you mind rebasing this on top of #118375? Then you can bless the tests in your commit and see the output changes due to these tweaks.

Just rebased and run bless

compiler-errors

I think this is a good opportunity to make more tweaks to the output since I can now see what's broken 😃 thanks for that

Also, plz squash the "rebase" commit into the "fix" commit.

tests/ui/stable-mir-print/basic_function.stdout

ouz-a · 2023-11-27T18:19:31Z

I think this is a good opportunity to make more tweaks to the output since I can now see what's broken 😃 thanks for that

Also, plz squash the "rebase" commit into the "fix" commit.

No problem, it's better for someone other than me to also look at this and have some opinion about it 😄

…=compiler-errors Add -Zunpretty=stable-mir output test As strongly suggested here rust-lang#118364 (comment) this adds output test for `-Zunpretty=stable-mir`, added test shows almost all the functionality of the current printer. r? ``@compiler-errors``

celinval

I noticed that the successor for Goto terminators is missing the bb in the label. For example, we're printing something like:

goto -> 5

when I expected:

goto -> bb5

compiler/stable_mir/src/mir/pretty.rs

bors · 2023-12-02T18:57:19Z

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

…=celinval Add -Zunpretty=stable-mir output test As strongly suggested here rust-lang#118364 (comment) this adds output test for `-Zunpretty=stable-mir`, added test shows almost all the functionality of the current printer. r? `@compiler-errors`

…elinval Add -Zunpretty=stable-mir output test As strongly suggested here rust-lang#118364 (comment) this adds output test for `-Zunpretty=stable-mir`, added test shows almost all the functionality of the current printer. r? `@compiler-errors`

bors · 2023-12-14T22:09:15Z

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

Add -Zunpretty=stable-mir output test As strongly suggested here rust-lang/rust#118364 (comment) this adds output test for `-Zunpretty=stable-mir`, added test shows almost all the functionality of the current printer. r? `@compiler-errors`

celinval

This is looking so much better. I'm hoping we can merge this after the next revision. Btw, have you compared the expected file with the internal MIR dump? It might be helpful to spot what's missing or what's wrong.

celinval · 2023-12-17T21:22:33Z

tests/ui/stable-mir-print/basic_function.stdout

-        _2 = 1 Add const 1_i32
-        assert(!move _2 bool),"attempt to compute `{} + {}`, which would overflow", 1, const 1_i32) -> [success: bb1, unwind continue]
+        _2 = CheckedAdd(_1, const 1_i32)
+        assert(!move _2 bool),"attempt to compute `{} + {}`, which would overflow", _1, const 1_i32) -> [success: bb1, unwind continue]


Where's this bool coming from?

celinval · 2023-12-17T21:28:17Z

tests/ui/stable-mir-print/basic_function.stdout

    bb0: {
-        _3 = refShared1
+        _3 = &1


Should this be _1?

celinval · 2023-12-17T21:29:03Z

tests/ui/stable-mir-print/basic_function.stdout

-        _5 = refMut {
-    kind: TwoPhaseBorrow,
-}2
+        _5 = &mut 2


Where's _5 declaration?

celinval · 2023-12-17T21:30:43Z

tests/ui/stable-mir-print/basic_function.stdout

 }
+fn bar(_0: &mut std::vec::Vec) -> std::vec::Vec {
+    let mut _0: std::vec::Vec;
+    let mut _1: &std::vec::Vec;


Are we missing _1 initialization?

ouz-a · 2023-12-21T13:13:02Z

This is looking so much better. I'm hoping we can merge this after the next revision. Btw, have you compared the expected file with the internal MIR dump? It might be helpful to spot what's missing or what's wrong.

Will go trough another pass and then compare with mir output

bors · 2024-01-11T04:53:16Z

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

apiraino · 2024-02-01T13:18:24Z

@ouz-a anything interesting to report w.r.t. to your prev. comment? No hurry, I'll just flip the review switch

@rustbot author

ouz-a · 2024-02-01T13:21:19Z

@ouz-a anything interesting to report w.r.t. to your prev. comment? No hurry, I'll just flip the review switch

@rustbot author

I been meaning to look at this for some time but I been extremely busy with life/job in past couple months 😓

celinval · 2024-03-16T23:56:03Z

Hey @ouz-a do you mind if I take a stab at this?

ouz-a · 2024-03-18T07:51:08Z

Hey @ouz-a do you mind if I take a stab at this?

Yeah, go ahead.

…rrors Fix misc printing issues in emit=stable_mir Trying to continue the work that `@ouz-a` started here: rust-lang#118364 Few modifications beyond fixes: 1. I made the `pretty_*` functions private. 2. I added a function to print the instance body 3. Changed a bunch of signatures to write to the writer directly. 4. Added a function to translate the place to its internal representation, so we could use the internal debug implementation. 5. Also removed `pretty_ty`, replaced by Display implementation of Ty which uses the internal display.

…rrors Fix misc printing issues in emit=stable_mir Trying to continue the work that ``@ouz-a`` started here: rust-lang#118364 Few modifications beyond fixes: 1. I made the `pretty_*` functions private. 2. I added a function to print the instance body 3. Changed a bunch of signatures to write to the writer directly. 4. Added a function to translate the place to its internal representation, so we could use the internal debug implementation. 5. Also removed `pretty_ty`, replaced by Display implementation of Ty which uses the internal display.

…rrors Fix misc printing issues in emit=stable_mir Trying to continue the work that ```@ouz-a``` started here: rust-lang#118364 Few modifications beyond fixes: 1. I made the `pretty_*` functions private. 2. I added a function to print the instance body 3. Changed a bunch of signatures to write to the writer directly. 4. Added a function to translate the place to its internal representation, so we could use the internal debug implementation. 5. Also removed `pretty_ty`, replaced by Display implementation of Ty which uses the internal display.

…rrors Fix misc printing issues in emit=stable_mir Trying to continue the work that ````@ouz-a```` started here: rust-lang#118364 Few modifications beyond fixes: 1. I made the `pretty_*` functions private. 2. I added a function to print the instance body 3. Changed a bunch of signatures to write to the writer directly. 4. Added a function to translate the place to its internal representation, so we could use the internal debug implementation. 5. Also removed `pretty_ty`, replaced by Display implementation of Ty which uses the internal display.

Rollup merge of rust-lang#122801 - celinval:smir-pretty, r=compiler-errors Fix misc printing issues in emit=stable_mir Trying to continue the work that ````@ouz-a```` started here: rust-lang#118364 Few modifications beyond fixes: 1. I made the `pretty_*` functions private. 2. I added a function to print the instance body 3. Changed a bunch of signatures to write to the writer directly. 4. Added a function to translate the place to its internal representation, so we could use the internal debug implementation. 5. Also removed `pretty_ty`, replaced by Display implementation of Ty which uses the internal display.

celinval · 2024-03-21T18:49:26Z

Closing this in favor of #122801

rustbot assigned celinval Nov 27, 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 Nov 27, 2023

ouz-a mentioned this pull request Nov 27, 2023

Add -Zunpretty=stable-mir output test #118375

Merged

ouz-a force-pushed the misc_emit_stable_fixes branch from a67486e to fcc7002 Compare November 27, 2023 18:08

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Nov 27, 2023

compiler-errors reviewed Nov 27, 2023

View reviewed changes

ouz-a force-pushed the misc_emit_stable_fixes branch from fcc7002 to bab21f3 Compare November 28, 2023 07:29

This comment has been minimized.

Sign in to view

ouz-a force-pushed the misc_emit_stable_fixes branch from bab21f3 to 844c493 Compare November 28, 2023 07:54

This comment has been minimized.

Sign in to view

ouz-a force-pushed the misc_emit_stable_fixes branch from 844c493 to 45a53d3 Compare November 28, 2023 08:29

celinval mentioned this pull request Nov 30, 2023

Change SwitchTarget representation in StableMIR #118461

Merged

celinval reviewed Nov 30, 2023

View reviewed changes

compiler-errors requested changes Nov 30, 2023

View reviewed changes

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

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

ouz-a force-pushed the misc_emit_stable_fixes branch from ee889d9 to 88df8fa Compare December 1, 2023 06:18

ouz-a force-pushed the misc_emit_stable_fixes branch from 88df8fa to 7e3c287 Compare December 14, 2023 15:19

ouz-a added 2 commits December 17, 2023 09:53

add stable_mir output test

cb192af

update test, compress push_str misc fixes

dc78b1c

ouz-a force-pushed the misc_emit_stable_fixes branch from 7e3c287 to dc78b1c Compare December 17, 2023 06:59

celinval reviewed Dec 17, 2023

View reviewed changes

celinval mentioned this pull request Jan 15, 2024

Provide Display implementation for types that can be used in diagnostic messages rust-lang/project-stable-mir#57

Open

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 Feb 1, 2024

celinval mentioned this pull request Mar 20, 2024

Fix misc printing issues in emit=stable_mir #122801

Merged

celinval closed this Mar 21, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix misc printing issues in `emit=stable_mir` #118364

Fix misc printing issues in `emit=stable_mir` #118364

ouz-a commented Nov 27, 2023

rustbot commented Nov 27, 2023

compiler-errors commented Nov 27, 2023 •

edited

ouz-a commented Nov 27, 2023

ouz-a commented Nov 27, 2023

compiler-errors commented Nov 27, 2023

ouz-a commented Nov 27, 2023

compiler-errors left a comment

ouz-a commented Nov 27, 2023

This comment has been minimized.

This comment has been minimized.

celinval left a comment

bors commented Dec 2, 2023

bors commented Dec 14, 2023

celinval left a comment

celinval Dec 17, 2023

celinval Dec 17, 2023

celinval Dec 17, 2023

celinval Dec 17, 2023

ouz-a commented Dec 21, 2023

bors commented Jan 11, 2024

apiraino commented Feb 1, 2024

ouz-a commented Feb 1, 2024

celinval commented Mar 16, 2024

ouz-a commented Mar 18, 2024

celinval commented Mar 21, 2024

Fix misc printing issues in emit=stable_mir #118364

Fix misc printing issues in emit=stable_mir #118364

Conversation

ouz-a commented Nov 27, 2023

rustbot commented Nov 27, 2023

compiler-errors commented Nov 27, 2023 • edited

ouz-a commented Nov 27, 2023

ouz-a commented Nov 27, 2023

compiler-errors commented Nov 27, 2023

ouz-a commented Nov 27, 2023

compiler-errors left a comment

Choose a reason for hiding this comment

ouz-a commented Nov 27, 2023

This comment has been minimized.

This comment has been minimized.

celinval left a comment

Choose a reason for hiding this comment

bors commented Dec 2, 2023

bors commented Dec 14, 2023

celinval left a comment

Choose a reason for hiding this comment

celinval Dec 17, 2023

Choose a reason for hiding this comment

celinval Dec 17, 2023

Choose a reason for hiding this comment

celinval Dec 17, 2023

Choose a reason for hiding this comment

celinval Dec 17, 2023

Choose a reason for hiding this comment

ouz-a commented Dec 21, 2023

bors commented Jan 11, 2024

apiraino commented Feb 1, 2024

ouz-a commented Feb 1, 2024

celinval commented Mar 16, 2024

ouz-a commented Mar 18, 2024

celinval commented Mar 21, 2024

Fix misc printing issues in `emit=stable_mir` #118364

Fix misc printing issues in `emit=stable_mir` #118364

compiler-errors commented Nov 27, 2023 •

edited