mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-22 06:44:35 +00:00
79611d90b6
Added "copy" to Debug fmt for copy operands
In MIR's debug mode (--emit mir) the printing for Operands is slightly inconsistent.
The RValues - values on the right side of an Assign - are usually printed with their Operand when they are Places.
Example:
_2 = move _3
But for arguments, the operand is omitted.
_2 = _1
I propose a change be made, to display the place with the operand.
_2 = copy _1
Move and copy have different semantics, meaning this difference is important and helpful to the user. It also adds consistency to the pretty printing.
-- EDIT --
Consider this example Rust program and its MIR output with the **updated pretty printer.**
This was generated with the arguments --emit mir --crate-type lib -Zmir-opt-level=0 (Otherwise, it's optimised away since it's a junk program).
```rust
fn main(foo: i32) {
let v = 10;
if v == 20 {
foo;
}
else {
v;
}
}
```
```MIR
// WARNING: This output format is intended for human consumers only
// and is subject to change without notice. Knock yourself out.
fn main(_1: i32) -> () {
debug foo => _1;
let mut _0: ();
let _2: i32;
let mut _3: bool;
let mut _4: i32;
let _5: i32;
let _6: i32;
scope 1 {
debug v => _2;
}
bb0: {
StorageLive(_2);
_2 = const 10_i32;
StorageLive(_3);
StorageLive(_4);
_4 = copy _2;
_3 = Eq(move _4, const 20_i32);
switchInt(move _3) -> [0: bb2, otherwise: bb1];
}
bb1: {
StorageDead(_4);
StorageLive(_5);
_5 = copy _1;
StorageDead(_5);
_0 = const ();
goto -> bb3;
}
bb2: {
StorageDead(_4);
StorageLive(_6);
_6 = copy _2;
StorageDead(_6);
_0 = const ();
goto -> bb3;
}
bb3: {
StorageDead(_3);
StorageDead(_2);
return;
}
}
```
In this example program, we can see that when we move a place, it is preceded by "move". e.g. ``` _3 = Eq(move _4, const 20_i32);```. However, when we copy a place such as ```_5 = _1;```, it is not preceded by the operand in the original printout. I propose to change the print to include the copy ```_5 = copy _1``` as in this example.
Regarding the arguments part. When I originally submitted this PR, I was under the impression this only affected the print for arguments to a function, but actually, it affects anything that uses a copy. This is preferable anyway with regard to consistency. The PR is about making ```copy``` explicit.
|
||
|---|---|---|
| .. | ||
| borrowed_local.borrowed.CopyProp.panic-abort.diff | ||
| borrowed_local.borrowed.CopyProp.panic-unwind.diff | ||
| borrowed_local.compare_address.CopyProp.panic-abort.diff | ||
| borrowed_local.compare_address.CopyProp.panic-unwind.diff | ||
| borrowed_local.non_freeze.CopyProp.panic-abort.diff | ||
| borrowed_local.non_freeze.CopyProp.panic-unwind.diff | ||
| borrowed_local.rs | ||
| branch.foo.CopyProp.panic-abort.diff | ||
| branch.foo.CopyProp.panic-unwind.diff | ||
| branch.rs | ||
| calls.multiple_edges.CopyProp.diff | ||
| calls.nrvo.CopyProp.diff | ||
| calls.rs | ||
| copy_propagation_arg.arg_src.CopyProp.panic-abort.diff | ||
| copy_propagation_arg.arg_src.CopyProp.panic-unwind.diff | ||
| copy_propagation_arg.bar.CopyProp.panic-abort.diff | ||
| copy_propagation_arg.bar.CopyProp.panic-unwind.diff | ||
| copy_propagation_arg.baz.CopyProp.panic-abort.diff | ||
| copy_propagation_arg.baz.CopyProp.panic-unwind.diff | ||
| copy_propagation_arg.foo.CopyProp.panic-abort.diff | ||
| copy_propagation_arg.foo.CopyProp.panic-unwind.diff | ||
| copy_propagation_arg.rs | ||
| custom_move_arg.f.CopyProp.panic-abort.diff | ||
| custom_move_arg.f.CopyProp.panic-unwind.diff | ||
| custom_move_arg.rs | ||
| cycle.main.CopyProp.panic-abort.diff | ||
| cycle.main.CopyProp.panic-unwind.diff | ||
| cycle.rs | ||
| dead_stores_79191.f.CopyProp.after.panic-abort.mir | ||
| dead_stores_79191.f.CopyProp.after.panic-unwind.mir | ||
| dead_stores_79191.rs | ||
| dead_stores_better.f.CopyProp.after.panic-abort.mir | ||
| dead_stores_better.f.CopyProp.after.panic-unwind.mir | ||
| dead_stores_better.rs | ||
| issue_107511.main.CopyProp.panic-abort.diff | ||
| issue_107511.main.CopyProp.panic-unwind.diff | ||
| issue_107511.rs | ||
| move_arg.f.CopyProp.panic-abort.diff | ||
| move_arg.f.CopyProp.panic-unwind.diff | ||
| move_arg.rs | ||
| move_projection.f.CopyProp.panic-abort.diff | ||
| move_projection.f.CopyProp.panic-unwind.diff | ||
| move_projection.rs | ||
| mutate_through_pointer.f.CopyProp.diff | ||
| mutate_through_pointer.rs | ||
| non_dominate.f.CopyProp.diff | ||
| non_dominate.rs | ||
| partial_init.main.CopyProp.diff | ||
| partial_init.rs | ||
| reborrow.demiraw.CopyProp.panic-abort.diff | ||
| reborrow.demiraw.CopyProp.panic-unwind.diff | ||
| reborrow.miraw.CopyProp.panic-abort.diff | ||
| reborrow.miraw.CopyProp.panic-unwind.diff | ||
| reborrow.remut.CopyProp.panic-abort.diff | ||
| reborrow.remut.CopyProp.panic-unwind.diff | ||
| reborrow.reraw.CopyProp.panic-abort.diff | ||
| reborrow.reraw.CopyProp.panic-unwind.diff | ||
| reborrow.rs | ||