From 1b7b33e513c1b64902e5341a4c4faaacac685fc0 Mon Sep 17 00:00:00 2001 From: Erik Desjardins Date: Sun, 14 Mar 2021 13:53:16 -0400 Subject: [PATCH] bless tests (32-bit) --- ...s.foo.MatchBranchSimplification.32bit.diff | 29 ++++++++++--------- ...e_branches.foo.PreCodegen.before.32bit.mir | 13 +-------- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.32bit.diff b/src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.32bit.diff index 6ee8e6b7748..9f0db1db1b2 100644 --- a/src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.32bit.diff +++ b/src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.32bit.diff @@ -5,22 +5,25 @@ debug bar => _1; // in scope 0 at $DIR/matches_reduce_branches.rs:7:8: 7:11 let mut _0: (); // return place in scope 0 at $DIR/matches_reduce_branches.rs:7:25: 7:25 let mut _2: isize; // in scope 0 at $DIR/matches_reduce_branches.rs:8:22: 8:26 ++ let mut _3: isize; // in scope 0 at $DIR/matches_reduce_branches.rs:8:22: 8:26 bb0: { _2 = discriminant(_1); // scope 0 at $DIR/matches_reduce_branches.rs:8:22: 8:26 - switchInt(move _2) -> [0_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/matches_reduce_branches.rs:8:22: 8:26 - } - - bb1: { - _0 = const (); // scope 0 at $DIR/matches_reduce_branches.rs:10:6: 10:6 - goto -> bb3; // scope 0 at $DIR/matches_reduce_branches.rs:8:5: 10:6 - } - - bb2: { - goto -> bb3; // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL - } - - bb3: { +- switchInt(move _2) -> [0_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/matches_reduce_branches.rs:8:22: 8:26 +- } +- +- bb1: { +- goto -> bb3; // scope 0 at $DIR/matches_reduce_branches.rs:8:5: 10:6 +- } +- +- bb2: { +- goto -> bb3; // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL +- } +- +- bb3: { ++ StorageLive(_3); // scope 0 at $DIR/matches_reduce_branches.rs:8:22: 8:26 ++ _3 = move _2; // scope 0 at $DIR/matches_reduce_branches.rs:8:22: 8:26 ++ StorageDead(_3); // scope 0 at $DIR/matches_reduce_branches.rs:8:22: 8:26 return; // scope 0 at $DIR/matches_reduce_branches.rs:11:2: 11:2 } } diff --git a/src/test/mir-opt/matches_reduce_branches.foo.PreCodegen.before.32bit.mir b/src/test/mir-opt/matches_reduce_branches.foo.PreCodegen.before.32bit.mir index 8ec09ce8665..e3b318c949f 100644 --- a/src/test/mir-opt/matches_reduce_branches.foo.PreCodegen.before.32bit.mir +++ b/src/test/mir-opt/matches_reduce_branches.foo.PreCodegen.before.32bit.mir @@ -3,19 +3,8 @@ fn foo(_1: Option<()>) -> () { debug bar => _1; // in scope 0 at $DIR/matches_reduce_branches.rs:7:8: 7:11 let mut _0: (); // return place in scope 0 at $DIR/matches_reduce_branches.rs:7:25: 7:25 - let mut _2: isize; // in scope 0 at $DIR/matches_reduce_branches.rs:8:22: 8:26 bb0: { - _2 = discriminant(_1); // scope 0 at $DIR/matches_reduce_branches.rs:8:22: 8:26 - switchInt(move _2) -> [0_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/matches_reduce_branches.rs:8:22: 8:26 - } - - bb1: { - _0 = const (); // scope 0 at $DIR/matches_reduce_branches.rs:10:6: 10:6 - return; // scope 0 at $DIR/matches_reduce_branches.rs:8:5: 10:6 - } - - bb2: { - return; // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL + return; // scope 0 at $DIR/matches_reduce_branches.rs:11:2: 11:2 } }