mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-25 04:06:55 +01:00
ac24299636
The `mir!` macro has multiple parts: - An optional return type annotation. - A sequence of zero or more local declarations. - A mandatory starting anonymous basic block, which is brace-delimited. - A sequence of zero of more additional named basic blocks. Some `mir!` invocations use braces with a "block" style, like so: ``` mir! { let _unit: (); { let non_copy = S(42); let ptr = std::ptr::addr_of_mut!(non_copy); // Inside `callee`, the first argument and `*ptr` are basically // aliasing places! Call(_unit = callee(Move(*ptr), ptr), ReturnTo(after_call), UnwindContinue()) } after_call = { Return() } } ``` Some invocations use parens with a "block" style, like so: ``` mir!( let x: [i32; 2]; let one: i32; { x = [42, 43]; one = 1; x = [one, 2]; RET = Move(x); Return() } ) ``` And some invocations uses parens with a "tighter" style, like so: ``` mir!({ SetDiscriminant(*b, 0); Return() }) ``` This last style is generally used for cases where just the mandatory starting basic block is present. Its braces are placed next to the parens. This commit changes all `mir!` invocations to use braces with a "block" style. Why? - Consistency is good. - The contents of the invocation is a block of code, so it's odd to use parens. They are more normally used for function-like macros. - Most importantly, the next commit will enable rustfmt for `tests/mir-opt/`. rustfmt is more aggressive about formatting macros that use parens than macros that use braces. Without this commit's changes, rustfmt would break a couple of `mir!` macro invocations that use braces within `tests/mir-opt` by inserting an extraneous comma. E.g.: ``` mir!(type RET = (i32, bool);, { // extraneous comma after ';' RET.0 = 1; RET.1 = true; Return() }) ``` Switching those `mir!` invocations to use braces avoids that problem, resulting in this, which is nicer to read as well as being valid syntax: ``` mir! { type RET = (i32, bool); { RET.0 = 1; RET.1 = true; Return() } } ```
47 lines
1.2 KiB
Rust
47 lines
1.2 KiB
Rust
// This example is interesting because the non-transitive version of `MaybeLiveLocals` would
|
|
// report that *all* of these stores are live.
|
|
//
|
|
//@ needs-unwind
|
|
//@ test-mir-pass: DeadStoreElimination-initial
|
|
|
|
#![feature(core_intrinsics, custom_mir)]
|
|
use std::intrinsics::mir::*;
|
|
|
|
#[inline(never)]
|
|
fn cond() -> bool {
|
|
false
|
|
}
|
|
|
|
// EMIT_MIR cycle.cycle.DeadStoreElimination-initial.diff
|
|
#[custom_mir(dialect = "runtime", phase = "post-cleanup")]
|
|
fn cycle(mut x: i32, mut y: i32, mut z: i32) {
|
|
// CHECK-LABEL: fn cycle(
|
|
// CHECK-NOT: {{_.*}} = {{_.*}};
|
|
// CHECK-NOT: {{_.*}} = move {{_.*}};
|
|
|
|
// We use custom MIR to avoid generating debuginfo, that would force to preserve writes.
|
|
mir! {
|
|
let condition: bool;
|
|
{
|
|
Call(condition = cond(), ReturnTo(bb1), UnwindContinue())
|
|
}
|
|
bb1 = {
|
|
match condition { true => bb2, _ => ret }
|
|
}
|
|
bb2 = {
|
|
let temp = z;
|
|
z = y;
|
|
y = x;
|
|
x = temp;
|
|
Call(condition = cond(), ReturnTo(bb1), UnwindContinue())
|
|
}
|
|
ret = {
|
|
Return()
|
|
}
|
|
}
|
|
}
|
|
|
|
fn main() {
|
|
cycle(1, 2, 3);
|
|
}
|