MIR printing: print the path of uneval'd const #122290

RalfJung · 2024-03-10T13:08:04Z

Currently it just prints const _ which makes it impossible to say which constant is being referred to.

Also refer to promoteds in a consistent way; previously MIR printing would do

promoted[0] in C1: &Option<Cell<i32>> = {
    // ...
}

Now that should be

const C1::promoted[0]: &Option<Cell<i32>> = {
    // ...
}

We don't seem to have a test for that so I tried it by hand, it seems to work:

const main::promoted[12]: &[&str; 3] = {
    let mut _0: &[&str; 3];
    let mut _1: [&str; 3];
    let mut _2: &str;
    let mut _3: &str;
    let mut _4: &str;
    let mut _5: &str;

    bb0: {
        _3 = const "b";
        _2 = &(*_3);
        _5 = const "c";
        _4 = &(*_5);
        _1 = [const "a", move _2, move _4];
        _0 = &_1;
        return;
    }
}

rustbot · 2024-03-10T13:08:12Z

r? @davidtwco

rustbot has assigned @davidtwco.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

RalfJung · 2024-03-10T13:09:33Z

compiler/rustc_const_eval/src/const_eval/eval_queries.rs

@@ -67,7 +67,7 @@ fn eval_body_using_ecx<'mir, 'tcx>(
    trace!(
        "eval_body_using_ecx: pushing stack frame for global: {}{}",
        with_no_trimmed_paths!(ecx.tcx.def_path_str(cid.instance.def_id())),
-        cid.promoted.map_or_else(String::new, |p| format!("::promoted[{p:?}]"))
+        cid.promoted.map_or_else(String::new, |p| format!("::{p:?}"))


p has type mir::Promoted which already adds the promoted[...] in its debug format.

… a consistent way

RalfJung · 2024-03-10T14:00:19Z

tests/mir-opt/pre-codegen/checked_ops.checked_shl.PreCodegen.after.mir

@@ -40,7 +40,7 @@ fn checked_shl(_1: u32, _2: u32) -> Option<u32> {
        _3 = BitAnd(_2, const 31_u32);
        _4 = ShlUnchecked(_1, _3);
        StorageDead(_3);
-        _5 = Ge(_2, const _);
+        _5 = Ge(_2, const core::num::<impl u32>::BITS);


Strangely this one did not get updated by --bless.

EDIT: filed an issue: #122292

compiler-errors

thanks, this is a great improvement to the rendered MIR

compiler-errors · 2024-03-10T16:14:27Z

r? compiler-errors @bors r+ rollup

bors · 2024-03-10T16:14:30Z

📌 Commit 7d99e80 has been approved by compiler-errors

It is now in the queue for this repository.

…errors MIR printing: print the path of uneval'd const Currently it just prints `const _` which makes it impossible to say which constant is being referred to. Also refer to promoteds in a consistent way; previously MIR printing would do ``` promoted[0] in C1: &Option<Cell<i32>> = { // ... } ``` Now that should be ``` const C1::promoted[0]: &Option<Cell<i32>> = { // ... } ``` We don't seem to have a test for that so I tried it by hand, it seems to work: ``` const main::promoted[12]: &[&str; 3] = { let mut _0: &[&str; 3]; let mut _1: [&str; 3]; let mut _2: &str; let mut _3: &str; let mut _4: &str; let mut _5: &str; bb0: { _3 = const "b"; _2 = &(*_3); _5 = const "c"; _4 = &(*_5); _1 = [const "a", move _2, move _4]; _0 = &_1; return; } } ```

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#121754 ([bootstrap] Move the `split-debuginfo` setting to the per-target section) - rust-lang#122205 (ensure that sysroot is properly set for cross-targets) - rust-lang#122275 (disable OOM test in Miri) - rust-lang#122276 (io::Read trait: make it more clear when we are adressing implementations vs callers) - rust-lang#122286 (use Instance::expect_resolve() instead of unwraping Instance::resolve()) - rust-lang#122290 (MIR printing: print the path of uneval'd const) - rust-lang#122293 (diagnostics: Do not suggest using `#[unix_sigpipe]` without a value) - rust-lang#122297 (bootstrap: document what the triples in 'Build' mean) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#122275 (disable OOM test in Miri) - rust-lang#122276 (io::Read trait: make it more clear when we are adressing implementations vs callers) - rust-lang#122277 (BorrowedCursor docs clarification) - rust-lang#122286 (use Instance::expect_resolve() instead of unwraping Instance::resolve()) - rust-lang#122290 (MIR printing: print the path of uneval'd const) - rust-lang#122293 (diagnostics: Do not suggest using `#[unix_sigpipe]` without a value) - rust-lang#122297 (bootstrap: document what the triples in 'Build' mean) - rust-lang#122302 (docs: Correct ptr/ref verbiage in SliceIndex docs.) - rust-lang#122304 (fix metadata for dyn-star in new solver) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#122290 - RalfJung:mir-printing, r=compiler-errors MIR printing: print the path of uneval'd const Currently it just prints `const _` which makes it impossible to say which constant is being referred to. Also refer to promoteds in a consistent way; previously MIR printing would do ``` promoted[0] in C1: &Option<Cell<i32>> = { // ... } ``` Now that should be ``` const C1::promoted[0]: &Option<Cell<i32>> = { // ... } ``` We don't seem to have a test for that so I tried it by hand, it seems to work: ``` const main::promoted[12]: &[&str; 3] = { let mut _0: &[&str; 3]; let mut _1: [&str; 3]; let mut _2: &str; let mut _3: &str; let mut _4: &str; let mut _5: &str; bb0: { _3 = const "b"; _2 = &(*_3); _5 = const "c"; _4 = &(*_5); _1 = [const "a", move _2, move _4]; _0 = &_1; return; } } ```

rustbot assigned davidtwco Mar 10, 2024

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 Mar 10, 2024

RalfJung commented Mar 10, 2024

View reviewed changes

This comment has been minimized.

Sign in to view

MIR printing: print the path of uneval'd const; refer to promoteds in…

7d99e80

… a consistent way

RalfJung force-pushed the mir-printing branch from 8d56a96 to 7d99e80 Compare March 10, 2024 13:59

RalfJung commented Mar 10, 2024

View reviewed changes

compiler-errors approved these changes Mar 10, 2024

View reviewed changes

rustbot assigned compiler-errors and unassigned davidtwco Mar 10, 2024

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 Mar 10, 2024

matthiaskrgr mentioned this pull request Mar 10, 2024

Rollup of 8 pull requests #122303

Closed

matthiaskrgr mentioned this pull request Mar 10, 2024

Rollup of 9 pull requests #122312

Merged

bors merged commit 9ccbbda into rust-lang:master Mar 11, 2024
11 checks passed

rustbot added this to the 1.78.0 milestone Mar 11, 2024

RalfJung deleted the mir-printing branch March 11, 2024 06:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MIR printing: print the path of uneval'd const #122290

MIR printing: print the path of uneval'd const #122290

RalfJung commented Mar 10, 2024

rustbot commented Mar 10, 2024

RalfJung Mar 10, 2024

This comment has been minimized.

RalfJung Mar 10, 2024 •

edited

Loading

compiler-errors left a comment

compiler-errors commented Mar 10, 2024

bors commented Mar 10, 2024

MIR printing: print the path of uneval'd const #122290

MIR printing: print the path of uneval'd const #122290

Conversation

RalfJung commented Mar 10, 2024

rustbot commented Mar 10, 2024

RalfJung Mar 10, 2024

Choose a reason for hiding this comment

This comment has been minimized.

RalfJung Mar 10, 2024 • edited Loading

Choose a reason for hiding this comment

compiler-errors left a comment

Choose a reason for hiding this comment

compiler-errors commented Mar 10, 2024

bors commented Mar 10, 2024

RalfJung Mar 10, 2024 •

edited

Loading