From 39be0b5b6caa0090eaf91c797e2895a007e76354 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Fri, 17 Apr 2020 18:31:42 -0300 Subject: [PATCH] Bless mir-opt tests --- .../32bit/rustc.main.ConstProp.after.mir | 30 ++++++++--------- .../64bit/rustc.main.ConstProp.after.mir | 32 +++++++++---------- .../rustc.no_codegen.PreCodegen.after.mir | 12 +------ 3 files changed, 32 insertions(+), 42 deletions(-) diff --git a/src/test/mir-opt/const_allocation2/32bit/rustc.main.ConstProp.after.mir b/src/test/mir-opt/const_allocation2/32bit/rustc.main.ConstProp.after.mir index efd14ea140f..7b300782c63 100644 --- a/src/test/mir-opt/const_allocation2/32bit/rustc.main.ConstProp.after.mir +++ b/src/test/mir-opt/const_allocation2/32bit/rustc.main.ConstProp.after.mir @@ -30,41 +30,41 @@ fn main() -> () { } alloc0 (static: FOO, size: 8, align: 4) { - ╾alloc25+0╼ 03 00 00 00 │ ╾──╼.... + ╾alloc21+0╼ 03 00 00 00 │ ╾──╼.... } -alloc25 (size: 48, align: 4) { - 0x00 │ 00 00 00 00 __ __ __ __ ╾alloc10+0╼ 00 00 00 00 │ ....░░░░╾──╼.... - 0x10 │ 00 00 00 00 __ __ __ __ ╾alloc15+0╼ 02 00 00 00 │ ....░░░░╾──╼.... - 0x20 │ 01 00 00 00 2a 00 00 00 ╾alloc23+0╼ 03 00 00 00 │ ....*...╾──╼.... +alloc21 (size: 48, align: 4) { + 0x00 │ 00 00 00 00 __ __ __ __ ╾alloc4+0─╼ 00 00 00 00 │ ....░░░░╾──╼.... + 0x10 │ 00 00 00 00 __ __ __ __ ╾alloc9+0─╼ 02 00 00 00 │ ....░░░░╾──╼.... + 0x20 │ 01 00 00 00 2a 00 00 00 ╾alloc19+0╼ 03 00 00 00 │ ....*...╾──╼.... } -alloc10 (size: 0, align: 4) {} +alloc4 (size: 0, align: 4) {} -alloc15 (size: 8, align: 4) { - ╾alloc13+0╼ ╾alloc14+0╼ │ ╾──╼╾──╼ +alloc9 (size: 8, align: 4) { + ╾alloc7+0─╼ ╾alloc8+0─╼ │ ╾──╼╾──╼ } -alloc13 (size: 1, align: 1) { +alloc7 (size: 1, align: 1) { 05 │ . } -alloc14 (size: 1, align: 1) { +alloc8 (size: 1, align: 1) { 06 │ . } -alloc23 (size: 12, align: 4) { - ╾alloc19+3╼ ╾alloc20+0╼ ╾alloc22+2╼ │ ╾──╼╾──╼╾──╼ +alloc19 (size: 12, align: 4) { + ╾alloc15+3╼ ╾alloc16+0╼ ╾alloc18+2╼ │ ╾──╼╾──╼╾──╼ } -alloc19 (size: 4, align: 1) { +alloc15 (size: 4, align: 1) { 2a 45 15 6f │ *E.o } -alloc20 (size: 1, align: 1) { +alloc16 (size: 1, align: 1) { 2a │ * } -alloc22 (size: 4, align: 1) { +alloc18 (size: 4, align: 1) { 2a 45 15 6f │ *E.o } diff --git a/src/test/mir-opt/const_allocation2/64bit/rustc.main.ConstProp.after.mir b/src/test/mir-opt/const_allocation2/64bit/rustc.main.ConstProp.after.mir index 3b649ee7a24..6821196fe4a 100644 --- a/src/test/mir-opt/const_allocation2/64bit/rustc.main.ConstProp.after.mir +++ b/src/test/mir-opt/const_allocation2/64bit/rustc.main.ConstProp.after.mir @@ -30,44 +30,44 @@ fn main() -> () { } alloc0 (static: FOO, size: 16, align: 8) { - ╾──────alloc25+0──────╼ 03 00 00 00 00 00 00 00 │ ╾──────╼........ + ╾──────alloc21+0──────╼ 03 00 00 00 00 00 00 00 │ ╾──────╼........ } -alloc25 (size: 72, align: 8) { - 0x00 │ 00 00 00 00 __ __ __ __ ╾──────alloc10+0──────╼ │ ....░░░░╾──────╼ +alloc21 (size: 72, align: 8) { + 0x00 │ 00 00 00 00 __ __ __ __ ╾──────alloc4+0───────╼ │ ....░░░░╾──────╼ 0x10 │ 00 00 00 00 00 00 00 00 00 00 00 00 __ __ __ __ │ ............░░░░ - 0x20 │ ╾──────alloc15+0──────╼ 02 00 00 00 00 00 00 00 │ ╾──────╼........ - 0x30 │ 01 00 00 00 2a 00 00 00 ╾──────alloc23+0──────╼ │ ....*...╾──────╼ + 0x20 │ ╾──────alloc9+0───────╼ 02 00 00 00 00 00 00 00 │ ╾──────╼........ + 0x30 │ 01 00 00 00 2a 00 00 00 ╾──────alloc19+0──────╼ │ ....*...╾──────╼ 0x40 │ 03 00 00 00 00 00 00 00 │ ........ } -alloc10 (size: 0, align: 8) {} +alloc4 (size: 0, align: 8) {} -alloc15 (size: 16, align: 8) { - ╾──────alloc13+0──────╼ ╾──────alloc14+0──────╼ │ ╾──────╼╾──────╼ +alloc9 (size: 16, align: 8) { + ╾──────alloc7+0───────╼ ╾──────alloc8+0───────╼ │ ╾──────╼╾──────╼ } -alloc13 (size: 1, align: 1) { +alloc7 (size: 1, align: 1) { 05 │ . } -alloc14 (size: 1, align: 1) { +alloc8 (size: 1, align: 1) { 06 │ . } -alloc23 (size: 24, align: 8) { - 0x00 │ ╾──────alloc19+3──────╼ ╾──────alloc20+0──────╼ │ ╾──────╼╾──────╼ - 0x10 │ ╾──────alloc22+2──────╼ │ ╾──────╼ +alloc19 (size: 24, align: 8) { + 0x00 │ ╾──────alloc15+3──────╼ ╾──────alloc16+0──────╼ │ ╾──────╼╾──────╼ + 0x10 │ ╾──────alloc18+2──────╼ │ ╾──────╼ } -alloc19 (size: 4, align: 1) { +alloc15 (size: 4, align: 1) { 2a 45 15 6f │ *E.o } -alloc20 (size: 1, align: 1) { +alloc16 (size: 1, align: 1) { 2a │ * } -alloc22 (size: 4, align: 1) { +alloc18 (size: 4, align: 1) { 2a 45 15 6f │ *E.o } diff --git a/src/test/mir-opt/retain-never-const/rustc.no_codegen.PreCodegen.after.mir b/src/test/mir-opt/retain-never-const/rustc.no_codegen.PreCodegen.after.mir index 2d7a79ee44c..07d28efb9c3 100644 --- a/src/test/mir-opt/retain-never-const/rustc.no_codegen.PreCodegen.after.mir +++ b/src/test/mir-opt/retain-never-const/rustc.no_codegen.PreCodegen.after.mir @@ -2,20 +2,10 @@ fn no_codegen() -> () { let mut _0: (); // return place in scope 0 at $DIR/retain-never-const.rs:18:20: 18:20 - let mut _1: !; // in scope 0 at $DIR/retain-never-const.rs:19:13: 19:33 scope 1 { } bb0: { - StorageLive(_1); // bb0[0]: scope 0 at $DIR/retain-never-const.rs:19:13: 19:33 - _1 = const PrintName::::VOID; // bb0[1]: scope 0 at $DIR/retain-never-const.rs:19:13: 19:33 - // ty::Const - // + ty: ! - // + val: Unevaluated(DefId(0:9 ~ retain_never_const[317d]::{{impl}}[0]::VOID[0]), [T], None) - // mir::Constant - // + span: $DIR/retain-never-const.rs:19:13: 19:33 - // + user_ty: UserType(0) - // + literal: Const { ty: !, val: Unevaluated(DefId(0:9 ~ retain_never_const[317d]::{{impl}}[0]::VOID[0]), [T], None) } - unreachable; // bb0[2]: scope 0 at $DIR/retain-never-const.rs:19:13: 19:33 + unreachable; // bb0[0]: scope 0 at $DIR/retain-never-const.rs:19:13: 19:33 } }