diff --git a/tests/codegen/try_identity.rs b/tests/codegen/try_identity.rs index 87b7d0727d080..00672e3a425b4 100644 --- a/tests/codegen/try_identity.rs +++ b/tests/codegen/try_identity.rs @@ -15,7 +15,7 @@ type R = Result; pub fn try_identity(x: R) -> R { // CHECK: start: // FIXME(JakobDegen): Broken by deaggregation change CHECK-NOT\: br {{.*}} -// CHECK ret void +// CHECK: ret void let y = match into_result(x) { Err(e) => return from_error(From::from(e)), Ok(v) => v, diff --git a/tests/mir-opt/README.md b/tests/mir-opt/README.md index e4b252f5565b0..fd482ba5b1df4 100644 --- a/tests/mir-opt/README.md +++ b/tests/mir-opt/README.md @@ -59,7 +59,7 @@ on the output of a individual passes. Use `// skip-filecheck` to prevent FileCheck from running. -To check MIR for function `foo`, start with a `// CHECK-LABEL fn foo(` directive. +To check MIR for function `foo`, start with a `// CHECK-LABEL: fn foo(` directive. `{{regex}}` syntax allows to match `regex`. diff --git a/tests/mir-opt/unnamed-fields/field_access.rs b/tests/mir-opt/unnamed-fields/field_access.rs index 5badfa1646bc7..ac94499af2431 100644 --- a/tests/mir-opt/unnamed-fields/field_access.rs +++ b/tests/mir-opt/unnamed-fields/field_access.rs @@ -39,34 +39,34 @@ fn access(_: T) {} // CHECK-LABEL: fn foo( fn foo(foo: Foo) { - // CHECK [[a:_.*]] = (_1.0: u8); - // CHECK _.* = access::(move [[a]]) -> [return: bb1, unwind: bb5]; + // CHECK: [[a:_.*]] = (_1.0: u8); + // CHECK: _.* = access::(move [[a]]) -> [return: bb1, unwind: bb5]; access(foo.a); - // CHECK [[b:_.*]] = ((_1.1: Foo::{anon_adt#0}).0: i8); - // CHECK _.* = access::(move [[b]]) -> [return: bb2, unwind: bb5]; + // CHECK: [[b:_.*]] = ((_1.1: Foo::{anon_adt#0}).0: i8); + // CHECK: _.* = access::(move [[b]]) -> [return: bb2, unwind: bb5]; access(foo.b); - // CHECK [[c:_.*]] = ((_1.1: Foo::{anon_adt#0}).1: bool); - // CHECK _.* = access::(move [[c]]) -> [return: bb3, unwind: bb5]; + // CHECK: [[c:_.*]] = ((_1.1: Foo::{anon_adt#0}).1: bool); + // CHECK: _.* = access::(move [[c]]) -> [return: bb3, unwind: bb5]; access(foo.c); - // CHECK [[d:_.*]] = (((_1.2: Foo::{anon_adt#1}).0: Foo::{anon_adt#1}::{anon_adt#0}).0: [u8; 1]); - // CHECK _.* = access::<[u8; 1]>(move [[d]]) -> [return: bb4, unwind: bb5]; + // CHECK: [[d:_.*]] = (((_1.2: Foo::{anon_adt#1}).0: Foo::{anon_adt#1}::{anon_adt#0}).0: [u8; 1]); + // CHECK: _.* = access::<[u8; 1]>(move [[d]]) -> [return: bb4, unwind: bb5]; access(foo.d); } // CHECK-LABEL: fn bar( fn bar(bar: Bar) { unsafe { - // CHECK [[a:_.*]] = (_1.0: u8); - // CHECK _.* = access::(move [[a]]) -> [return: bb1, unwind: bb5]; + // CHECK: [[a:_.*]] = (_1.0: u8); + // CHECK: _.* = access::(move [[a]]) -> [return: bb1, unwind: bb5]; access(bar.a); - // CHECK [[b:_.*]] = ((_1.1: Bar::{anon_adt#0}).0: i8); - // CHECK _.* = access::(move [[b]]) -> [return: bb2, unwind: bb5]; + // CHECK: [[b:_.*]] = ((_1.1: Bar::{anon_adt#0}).0: i8); + // CHECK: _.* = access::(move [[b]]) -> [return: bb2, unwind: bb5]; access(bar.b); - // CHECK [[c:_.*]] = ((_1.1: Bar::{anon_adt#0}).1: bool); - // CHECK _.* = access::(move [[c]]) -> [return: bb3, unwind: bb5]; + // CHECK: [[c:_.*]] = ((_1.1: Bar::{anon_adt#0}).1: bool); + // CHECK: _.* = access::(move [[c]]) -> [return: bb3, unwind: bb5]; access(bar.c); - // CHECK [[d:_.*]] = (((_1.2: Bar::{anon_adt#1}).0: Bar::{anon_adt#1}::{anon_adt#0}).0: [u8; 1]); - // CHECK _.* = access::<[u8; 1]>(move [[d]]) -> [return: bb4, unwind: bb5]; + // CHECK: [[d:_.*]] = (((_1.2: Bar::{anon_adt#1}).0: Bar::{anon_adt#1}::{anon_adt#0}).0: [u8; 1]); + // CHECK: _.* = access::<[u8; 1]>(move [[d]]) -> [return: bb4, unwind: bb5]; access(bar.d); } }