Merge commit 'fbda869b4e230c788b6bce426038ba8419956f2d' into sync_cg_clif-2024-04-05

2024-04-05 16:20:23 +00:00
parent 5958f5e08f fbda869b4e
commit 6cf6fd38ec
16 changed files with 85 additions and 121 deletions
--- a/compiler/rustc_codegen_cranelift/src/num.rs
+++ b/compiler/rustc_codegen_cranelift/src/num.rs
@@ -130,7 +130,7 @@ pub(crate) fn codegen_int_binop<'tcx>(
    in_lhs: CValue<'tcx>,
    in_rhs: CValue<'tcx>,
 ) -> CValue<'tcx> {
-    if bin_op != BinOp::Shl && bin_op != BinOp::Shr {
+    if !matches!(bin_op, BinOp::Shl | BinOp::ShlUnchecked | BinOp::Shr | BinOp::ShrUnchecked) {
        assert_eq!(
            in_lhs.layout().ty,
            in_rhs.layout().ty,