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

bors · bors · commit 6bd715116ade · 2023-02-20T14:08:34.000Z
Rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-3eb5c4581a386b13c414e8c8bd73846ef37236d1
+7e253a7fb2e2e050021fed32da6fa2ec7bcea0fb
diff --git a/src/machine.rs b/src/machine.rs
@@ -821,8 +821,8 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {
     }
 
     #[inline(always)]
-    fn checked_binop_checks_overflow(ecx: &MiriInterpCx<'mir, 'tcx>) -> bool {
-        ecx.tcx.sess.overflow_checks()
+    fn ignore_checkable_overflow_assertions(ecx: &MiriInterpCx<'mir, 'tcx>) -> bool {
+        !ecx.tcx.sess.overflow_checks()
     }
 
     #[inline(always)]

Original file line number	Diff line number	Diff line change
`@@ -821,8 +821,8 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {`
`821`	`821`	`}`
`822`	`822`
`823`	`823`	`#[inline(always)]`
`824`		`- fn checked_binop_checks_overflow(ecx: &MiriInterpCx<'mir, 'tcx>) -> bool {`
`825`		`- ecx.tcx.sess.overflow_checks()`
	`824`	`+ fn ignore_checkable_overflow_assertions(ecx: &MiriInterpCx<'mir, 'tcx>) -> bool {`
	`825`	`+ !ecx.tcx.sess.overflow_checks()`
`826`	`826`	`}`
`827`	`827`
`828`	`828`	`#[inline(always)]`