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

rustup
rust-lang · May 20, 2022 · d543143 · d543143
2 parents d419efd + 9a96282
commit d543143
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-f24ef2e296ec6fc6fd2e24d7e4bfec3f4cb0577a
+22ee39504a702f75485582d02060495a01254de1
diff --git a/src/machine.rs b/src/machine.rs
@@ -470,7 +470,12 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
     }
 
     #[inline(always)]
-    fn enforce_number_validity(ecx: &MiriEvalContext<'mir, 'tcx>) -> bool {
+    fn enforce_number_init(ecx: &MiriEvalContext<'mir, 'tcx>) -> bool {
+        ecx.machine.enforce_number_validity
+    }
+
+    #[inline(always)]
+    fn enforce_number_no_provenance(ecx: &MiriEvalContext<'mir, 'tcx>) -> bool {
         ecx.machine.enforce_number_validity
     }