Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 32 deletions

diff --git a/src/test/mir-opt/lower_intrinsics_e2e.rs b/src/test/mir-opt/lower_intrinsics_e2e.rs
deleted file mode 100644
index 872ef59b0..000000000
--- a/src/test/mir-opt/lower_intrinsics_e2e.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Checks that we do not have any branches in the MIR for the two tested functions.
-
-// compile-flags: -Cpanic=abort
-#![feature(core_intrinsics)]
-#![crate_type = "lib"]
-
-// EMIT_MIR lower_intrinsics_e2e.f_unit.PreCodegen.after.mir
-pub fn f_unit() {
-    f_dispatch(());
-}
-
-
-// EMIT_MIR lower_intrinsics_e2e.f_u64.PreCodegen.after.mir
-pub fn f_u64() {
-    f_dispatch(0u64);
-}
-
-#[inline(always)]
-pub fn f_dispatch<T>(t: T) {
-    if std::mem::size_of::<T>() == 0 {
-        f_zst(t);
-    } else {
-        f_non_zst(t);
-    }
-}
-
-#[inline(never)]
-pub fn f_zst<T>(_t: T) {
-}
-
-#[inline(never)]
-pub fn f_non_zst<T>(_t: T) {}