diff options
| author | bors <bors@rust-lang.org> | 2020-04-15 07:11:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-15 07:11:22 +0000 |
| commit | df768c5c8fcb361c4dc94b4c776d6a78c12862e1 (patch) | |
| tree | 1c90717e2a9fde66e583b7411ffe5f213a927263 /src/test/mir-opt/simplify_cfg/rustc.main.SimplifyCfg-initial.diff | |
| parent | 351eefe93a96f98d37182701590493b6710175c3 (diff) | |
| parent | 7341cad3f312df5d735f2a8c3f3eb4480ed3a95d (diff) | |
Auto merge of #71162 - Centril:rollup-jzg6ykc, r=Centril
Rollup of 4 pull requests Successful merges: - #70891 (unit rvalue, use constant `()` instead of tuple) - #71030 (rustc_target: Refactor target specifications related to Windows and UEFI) - #71100 (Miri: expand frame hooks) - #71116 (Entirely remove `DUMMY_HIR_ID`) Failed merges: r? @ghost
Diffstat (limited to 'src/test/mir-opt/simplify_cfg/rustc.main.SimplifyCfg-initial.diff')
| -rw-r--r-- | src/test/mir-opt/simplify_cfg/rustc.main.SimplifyCfg-initial.diff | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/test/mir-opt/simplify_cfg/rustc.main.SimplifyCfg-initial.diff b/src/test/mir-opt/simplify_cfg/rustc.main.SimplifyCfg-initial.diff index 856ee3508cb..7c8bdde5418 100644 --- a/src/test/mir-opt/simplify_cfg/rustc.main.SimplifyCfg-initial.diff +++ b/src/test/mir-opt/simplify_cfg/rustc.main.SimplifyCfg-initial.diff @@ -54,16 +54,30 @@ } - bb7: { -- _1 = (); // bb7[0]: scope 0 at $DIR/simplify_cfg.rs:7:9: 9:10 -- goto -> bb12; // bb7[1]: scope 0 at $DIR/simplify_cfg.rs:7:9: 9:10 +- _1 = const (); // bb7[0]: scope 0 at $DIR/simplify_cfg.rs:7:9: 9:10 + bb5: { -+ _1 = (); // bb5[0]: scope 0 at $DIR/simplify_cfg.rs:7:9: 9:10 ++ _1 = const (); // bb5[0]: scope 0 at $DIR/simplify_cfg.rs:7:9: 9:10 + // ty::Const + // + ty: () + // + val: Value(Scalar(<ZST>)) + // mir::Constant + // + span: $DIR/simplify_cfg.rs:7:9: 9:10 + // + literal: Const { ty: (), val: Value(Scalar(<ZST>)) } +- goto -> bb12; // bb7[1]: scope 0 at $DIR/simplify_cfg.rs:7:9: 9:10 + StorageDead(_2); // bb5[1]: scope 0 at $DIR/simplify_cfg.rs:10:5: 10:6 + goto -> bb0; // bb5[2]: scope 0 at $DIR/simplify_cfg.rs:6:5: 10:6 } - bb8: { -- _0 = (); // bb8[0]: scope 0 at $DIR/simplify_cfg.rs:8:13: 8:18 +- _0 = const (); // bb8[0]: scope 0 at $DIR/simplify_cfg.rs:8:13: 8:18 ++ bb6: { ++ _0 = const (); // bb6[0]: scope 0 at $DIR/simplify_cfg.rs:8:13: 8:18 + // ty::Const + // + ty: () + // + val: Value(Scalar(<ZST>)) + // mir::Constant + // + span: $DIR/simplify_cfg.rs:8:13: 8:18 + // + literal: Const { ty: (), val: Value(Scalar(<ZST>)) } - goto -> bb9; // bb8[1]: scope 0 at $DIR/simplify_cfg.rs:8:13: 8:18 - } - @@ -87,8 +101,6 @@ - - bb13: { - return; // bb13[0]: scope 0 at $DIR/simplify_cfg.rs:11:2: 11:2 -+ bb6: { -+ _0 = (); // bb6[0]: scope 0 at $DIR/simplify_cfg.rs:8:13: 8:18 + StorageDead(_2); // bb6[1]: scope 0 at $DIR/simplify_cfg.rs:10:5: 10:6 + return; // bb6[2]: scope 0 at $DIR/simplify_cfg.rs:11:2: 11:2 } |