Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 21 deletions

diff --git a/src/test/ui/mir/simplify-branch-same.rs b/src/test/ui/mir/simplify-branch-same.rs
deleted file mode 100644
index d631c33d6..000000000
--- a/src/test/ui/mir/simplify-branch-same.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Regression test for SimplifyBranchSame miscompilation.
-// run-pass
-
-macro_rules! m {
-    ($a:expr, $b:expr, $c:block) => {
-        match $a {
-            Lto::Fat | Lto::Thin => { $b; (); $c }
-            Lto::No => { $b; () }
-        }
-    }
-}
-
-pub enum Lto { No, Thin, Fat }
-
-fn f(mut cookie: u32, lto: Lto) -> u32 {
-    let mut _a = false;
-    m!(lto, _a = true, {cookie = 0});
-    cookie
-}
-
-fn main() { assert_eq!(f(42, Lto::Thin), 0) }