Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 33 insertions, 0 deletions

diff --git a/tests/mir-opt/const_prop/boolean_identities.test.ConstProp.diff b/tests/mir-opt/const_prop/boolean_identities.test.ConstProp.diff
new file mode 100644
index 000000000..0de800917
--- /dev/null
+++ b/tests/mir-opt/const_prop/boolean_identities.test.ConstProp.diff
@@ -0,0 +1,33 @@
+- // MIR for `test` before ConstProp
++ // MIR for `test` after ConstProp
+  
+  fn test(_1: bool, _2: bool) -> bool {
+      debug x => _1;                       // in scope 0 at $DIR/boolean_identities.rs:+0:13: +0:14
+      debug y => _2;                       // in scope 0 at $DIR/boolean_identities.rs:+0:22: +0:23
+      let mut _0: bool;                    // return place in scope 0 at $DIR/boolean_identities.rs:+0:34: +0:38
+      let mut _3: bool;                    // in scope 0 at $DIR/boolean_identities.rs:+1:5: +1:15
+      let mut _4: bool;                    // in scope 0 at $DIR/boolean_identities.rs:+1:6: +1:7
+      let mut _5: bool;                    // in scope 0 at $DIR/boolean_identities.rs:+1:18: +1:29
+      let mut _6: bool;                    // in scope 0 at $DIR/boolean_identities.rs:+1:19: +1:20
+  
+      bb0: {
+          StorageLive(_3);                 // scope 0 at $DIR/boolean_identities.rs:+1:5: +1:15
+          StorageLive(_4);                 // scope 0 at $DIR/boolean_identities.rs:+1:6: +1:7
+          _4 = _2;                         // scope 0 at $DIR/boolean_identities.rs:+1:6: +1:7
+-         _3 = BitOr(move _4, const true); // scope 0 at $DIR/boolean_identities.rs:+1:5: +1:15
++         _3 = const true;                 // scope 0 at $DIR/boolean_identities.rs:+1:5: +1:15
+          StorageDead(_4);                 // scope 0 at $DIR/boolean_identities.rs:+1:14: +1:15
+          StorageLive(_5);                 // scope 0 at $DIR/boolean_identities.rs:+1:18: +1:29
+          StorageLive(_6);                 // scope 0 at $DIR/boolean_identities.rs:+1:19: +1:20
+          _6 = _1;                         // scope 0 at $DIR/boolean_identities.rs:+1:19: +1:20
+-         _5 = BitAnd(move _6, const false); // scope 0 at $DIR/boolean_identities.rs:+1:18: +1:29
++         _5 = const false;                // scope 0 at $DIR/boolean_identities.rs:+1:18: +1:29
+          StorageDead(_6);                 // scope 0 at $DIR/boolean_identities.rs:+1:28: +1:29
+-         _0 = BitAnd(move _3, move _5);   // scope 0 at $DIR/boolean_identities.rs:+1:5: +1:29
++         _0 = const false;                // scope 0 at $DIR/boolean_identities.rs:+1:5: +1:29
+          StorageDead(_5);                 // scope 0 at $DIR/boolean_identities.rs:+1:28: +1:29
+          StorageDead(_3);                 // scope 0 at $DIR/boolean_identities.rs:+1:28: +1:29
+          return;                          // scope 0 at $DIR/boolean_identities.rs:+2:2: +2:2
+      }
+  }
+