Rustup to rustc 1.35.0-nightly (87a4363 2019-03-03)

Author: bjorn3

patches/0009-Workaround-missing-saturating_-add-sub-intrinsic-imp.patch

@@ -515,7 +515,8 @@ fn trans_stmt<'a, 'tcx: 'a>(
                         _ => bug!("Trying to ReifyFnPointer on non FnDef {:?}", ty),
                     }
                 }
-                Rvalue::Cast(CastKind::UnsafeFnPointer, operand, ty) => {
+                Rvalue::Cast(CastKind::UnsafeFnPointer, operand, ty)
+                | Rvalue::Cast(CastKind::MutToConstPointer, operand, ty) => {
                     let operand = trans_operand(fx, operand);
                     let layout = fx.layout_of(ty);
                     lval.write_cvalue(fx, operand.unchecked_cast_to(layout));

src/base.rs

@@ -192,6 +192,7 @@ pub fn codegen_intrinsic_call<'a, 'tcx: 'a>(
             ret.write_cvalue(fx, type_id);
         };
         _ if intrinsic.starts_with("unchecked_") || intrinsic == "exact_div", (c x, c y) {
+            // FIXME trap on overflow
             let bin_op = match intrinsic {
                 "unchecked_div" | "exact_div" => BinOp::Div,
                 "unchecked_rem" => BinOp::Rem,
@@ -278,6 +279,36 @@ pub fn codegen_intrinsic_call<'a, 'tcx: 'a>(
             };
             ret.write_cvalue(fx, res);
         };
+        _ if intrinsic.starts_with("saturating_"), <T> (c x, c y) {
+            // FIXME implement saturating behavior
+            assert_eq!(x.layout().ty, y.layout().ty);
+            let bin_op = match intrinsic {
+                "saturating_add" => BinOp::Add,
+                "saturating_sub" => BinOp::Sub,
+                "saturating_mul" => BinOp::Mul,
+                _ => unimplemented!("intrinsic {}", intrinsic),
+            };
+            let res = match T.sty {
+                ty::Uint(_) => crate::base::trans_int_binop(
+                    fx,
+                    bin_op,
+                    x,
+                    y,
+                    ret.layout().ty,
+                    false,
+                ),
+                ty::Int(_) => crate::base::trans_int_binop(
+                    fx,
+                    bin_op,
+                    x,
+                    y,
+                    ret.layout().ty,
+                    true,
+                ),
+                _ => panic!(),
+            };
+            ret.write_cvalue(fx, res);
+        };
         rotate_left, <T>(v x, v y) {
             let layout = fx.layout_of(T);
             let res = fx.bcx.ins().rotl(x, y);