Auto merge of #1168 - RalfJung:rustup, r=RalfJung

Rustup

Author: bors

rust-version

@@ -1 +1 @@
-0cbcb17d3306d6e22eafc2c05ce885db97d0189c
+333c32a5a4a51cae562c47e0669bc5aeaf741c45

src/shims/intrinsics.rs

@@ -518,46 +518,6 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                 this.write_scalar(Scalar::from_uint(align.bytes(), ptr_size), dest)?;
             }
 
-            "unchecked_div" => {
-                let l = this.read_immediate(args[0])?;
-                let r = this.read_immediate(args[1])?;
-                let rval = r.to_scalar()?.to_bits(args[1].layout.size)?;
-                if rval == 0 {
-                    throw_ub_format!("Division by 0 in unchecked_div");
-                }
-                this.binop_ignore_overflow(mir::BinOp::Div, l, r, dest)?;
-            }
-
-            "unchecked_rem" => {
-                let l = this.read_immediate(args[0])?;
-                let r = this.read_immediate(args[1])?;
-                let rval = r.to_scalar()?.to_bits(args[1].layout.size)?;
-                if rval == 0 {
-                    throw_ub_format!("Division by 0 in unchecked_rem");
-                }
-                this.binop_ignore_overflow(mir::BinOp::Rem, l, r, dest)?;
-            }
-
-            #[rustfmt::skip]
-            | "unchecked_add"
-            | "unchecked_sub"
-            | "unchecked_mul"
-            => {
-                let l = this.read_immediate(args[0])?;
-                let r = this.read_immediate(args[1])?;
-                let op = match intrinsic_name {
-                    "unchecked_add" => mir::BinOp::Add,
-                    "unchecked_sub" => mir::BinOp::Sub,
-                    "unchecked_mul" => mir::BinOp::Mul,
-                    _ => bug!(),
-                };
-                let (res, overflowed, _ty) = this.overflowing_binary_op(op, l, r)?;
-                if overflowed {
-                    throw_ub_format!("Overflowing arithmetic in {}", intrinsic_name);
-                }
-                this.write_scalar(res, dest)?;
-            }
-
             "uninit" => {
                 // Check fast path: we don't want to force an allocation in case the destination is a simple value,
                 // but we also do not want to create a new allocation with 0s and then copy that over.

tests/compile-fail/div-by-zero-1.rs

@@ -2,10 +2,8 @@
 
 use std::intrinsics::*;
 
-//error-pattern: Division by 0 in unchecked_div
-
 fn main() {
     unsafe {
-        let _n = unchecked_div(1i64, 0);
+        let _n = unchecked_div(1i64, 0); //~ERROR dividing by zero
     }
 }

tests/compile-fail/div-by-zero-2.rs

@@ -0,0 +1,9 @@
+#![feature(core_intrinsics)]
+
+use std::intrinsics::*;
+
+fn main() {
+    unsafe {
+        let _n = unchecked_rem(3u32, 0); //~ ERROR calculating the remainder with a divisor of zero
+    }
+}

tests/compile-fail/div-by-zero-3.rs

@@ -1,5 +1,5 @@
 #![feature(core_intrinsics)]
 fn main() {
     // MAX overflow
-    unsafe { std::intrinsics::unchecked_add(40000u16, 30000); } //~ ERROR Overflowing arithmetic in unchecked_add
+    unsafe { std::intrinsics::unchecked_add(40000u16, 30000); } //~ ERROR Overflow executing `unchecked_add`
 }

tests/compile-fail/unchecked_add1.rs

@@ -1,5 +1,5 @@
 #![feature(core_intrinsics)]
 fn main() {
     // MIN overflow
-    unsafe { std::intrinsics::unchecked_add(-30000i16, -8000); } //~ ERROR Overflowing arithmetic in unchecked_add
+    unsafe { std::intrinsics::unchecked_add(-30000i16, -8000); } //~ ERROR Overflow executing `unchecked_add`
 }

tests/compile-fail/unchecked_add2.rs

@@ -0,0 +1,5 @@
+#![feature(core_intrinsics)]
+fn main() {
+    // MIN/-1 cannot be represented
+    unsafe { std::intrinsics::unchecked_div(i16::min_value(), -1); } //~ ERROR Overflow executing `unchecked_div`
+}

tests/compile-fail/unchecked_div1.rs

@@ -1,5 +1,5 @@
 #![feature(core_intrinsics)]
 fn main() {
     // MAX overflow
-    unsafe { std::intrinsics::unchecked_mul(300u16, 250u16); } //~ ERROR Overflowing arithmetic in unchecked_mul
+    unsafe { std::intrinsics::unchecked_mul(300u16, 250u16); } //~ ERROR Overflow executing `unchecked_mul`
 }

tests/compile-fail/unchecked_mul1.rs

@@ -1,5 +1,5 @@
 #![feature(core_intrinsics)]
 fn main() {
     // MIN overflow
-    unsafe { std::intrinsics::unchecked_mul(1_000_000_000i32, -4); } //~ ERROR Overflowing arithmetic in unchecked_mul
+    unsafe { std::intrinsics::unchecked_mul(1_000_000_000i32, -4); } //~ ERROR Overflow executing `unchecked_mul`
 }