about summary refs log tree commit diff
path: root/src/test/mir-opt/const_prop/mutable_variable.main.ConstProp.diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-03-23 12:23:27 +0000
committerbors <bors@rust-lang.org>2021-03-23 12:23:27 +0000
commit79e5814f4520f2c51b5307421db45cd82d134e76 (patch)
tree80ae11e03e167744403264c7cb629da877cf8e32 /src/test/mir-opt/const_prop/mutable_variable.main.ConstProp.diff
parent4eb0bc7346ef38218e21268001a898f6892db2c1 (diff)
parent6960bc9696b05b15d8d89ece2fef14e6e62a43fc (diff)
downloadrust-79e5814f4520f2c51b5307421db45cd82d134e76.tar.gz
rust-79e5814f4520f2c51b5307421db45cd82d134e76.zip
Auto merge of #83177 - erikdesjardins:zstassign, r=oli-obk
Remove assignments to ZST places instead of marking ZST return place as unused

partially reverts #83118

requested by `@tmiasko` in https://github.com/rust-lang/rust/pull/83118#issuecomment-799692574

r? `@oli-obk`
Diffstat (limited to 'src/test/mir-opt/const_prop/mutable_variable.main.ConstProp.diff')
-rw-r--r--src/test/mir-opt/const_prop/mutable_variable.main.ConstProp.diff2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/mir-opt/const_prop/mutable_variable.main.ConstProp.diff b/src/test/mir-opt/const_prop/mutable_variable.main.ConstProp.diff
index 349f1557a86..f159cfa025c 100644
--- a/src/test/mir-opt/const_prop/mutable_variable.main.ConstProp.diff
+++ b/src/test/mir-opt/const_prop/mutable_variable.main.ConstProp.diff
@@ -19,7 +19,7 @@
           StorageLive(_2);                 // scope 1 at $DIR/mutable_variable.rs:7:9: 7:10
 -         _2 = _1;                         // scope 1 at $DIR/mutable_variable.rs:7:13: 7:14
 +         _2 = const 99_i32;               // scope 1 at $DIR/mutable_variable.rs:7:13: 7:14
-          _0 = const ();                   // scope 0 at $DIR/mutable_variable.rs:4:11: 8:2
+          nop;                             // scope 0 at $DIR/mutable_variable.rs:4:11: 8:2
           StorageDead(_2);                 // scope 1 at $DIR/mutable_variable.rs:8:1: 8:2
           StorageDead(_1);                 // scope 0 at $DIR/mutable_variable.rs:8:1: 8:2
           return;                          // scope 0 at $DIR/mutable_variable.rs:8:2: 8:2