Auto merge of rust-lang#2350 - RalfJung:remove-deprecated, r=oli-obk

remove deprecated options

These have been deprecated a month ago and nobody said they need them. Is that enough time? We can also let this PR sit a little.

Cc rust-lang/miri#2187 rust-lang/miri#2188
(keeping them open to track removing their supporting infrastructure in the core interpreter)

README.md

@@ -329,17 +329,6 @@ The remaining flags are for advanced use only, and more likely to change or be r
 Some of these are **unsound**, which means they can lead
 to Miri failing to detect cases of undefined behavior in a program.
 
-* `-Zmiri-allow-uninit-numbers` disables the check to ensure that number types (integer and float
-  types) always hold initialized data. (They must still be initialized when any actual operation,
-  such as arithmetic, is performed.) Using this flag is **unsound** and
-  [deprecated](https://github.com/rust-lang/miri/issues/2187). This has no effect when
-  `-Zmiri-disable-validation` is present.
-* `-Zmiri-allow-ptr-int-transmute` makes Miri more accepting of transmutation between pointers and
-  integers via `mem::transmute` or union/pointer type punning. This has two effects: it disables the
-  check against integers storing a pointer (i.e., data with provenance), thus allowing
-  pointer-to-integer transmutation, and it treats integer-to-pointer transmutation as equivalent to
-  a cast. Implies `-Zmiri-permissive-provenance`. Using this flag is **unsound** and
-  [deprecated](https://github.com/rust-lang/miri/issues/2188).
 * `-Zmiri-disable-abi-check` disables checking [function ABI]. Using this flag
   is **unsound**.
 * `-Zmiri-disable-alignment-check` disables checking pointer alignment, so you

src/bin/miri.rs

@@ -328,19 +328,6 @@ fn main() {
                 "WARNING: the flag `-Zmiri-check-number-validity` no longer has any effect \
                         since it is now enabled by default"
             );
-        } else if arg == "-Zmiri-allow-uninit-numbers" {
-            eprintln!(
-                "WARNING: `-Zmiri-allow-uninit-numbers` is deprecated and planned to be removed. \
-                Please let us know at <https://github.com/rust-lang/miri/issues/2187> if you rely on this flag."
-            );
-            miri_config.allow_uninit_numbers = true;
-        } else if arg == "-Zmiri-allow-ptr-int-transmute" {
-            eprintln!(
-                "WARNING: `-Zmiri-allow-ptr-int-transmute` is deprecated and planned to be removed. \
-                Please let us know at <https://github.com/rust-lang/miri/issues/2188> if you rely on this flag."
-            );
-            miri_config.allow_ptr_int_transmute = true;
-            miri_config.provenance_mode = ProvenanceMode::Permissive;
         } else if arg == "-Zmiri-disable-abi-check" {
             miri_config.check_abi = false;
         } else if arg == "-Zmiri-disable-isolation" {
@@ -378,7 +365,6 @@ fn main() {
             eprintln!("WARNING: `-Zmiri-tag-raw-pointers` has no effect; it is enabled by default");
         } else if arg == "-Zmiri-strict-provenance" {
             miri_config.provenance_mode = ProvenanceMode::Strict;
-            miri_config.allow_ptr_int_transmute = false;
         } else if arg == "-Zmiri-permissive-provenance" {
             miri_config.provenance_mode = ProvenanceMode::Permissive;
         } else if arg == "-Zmiri-mute-stdout-stderr" {

src/eval.rs

@@ -77,10 +77,6 @@ pub struct MiriConfig {
     pub stacked_borrows: bool,
     /// Controls alignment checking.
     pub check_alignment: AlignmentCheck,
-    /// Controls integer and float validity initialization checking.
-    pub allow_uninit_numbers: bool,
-    /// Controls how we treat ptr2int and int2ptr transmutes.
-    pub allow_ptr_int_transmute: bool,
     /// Controls function [ABI](Abi) checking.
     pub check_abi: bool,
     /// Action for an op requiring communication with the host.
@@ -134,8 +130,6 @@ impl Default for MiriConfig {
             validate: true,
             stacked_borrows: true,
             check_alignment: AlignmentCheck::Int,
-            allow_uninit_numbers: false,
-            allow_ptr_int_transmute: false,
             check_abi: true,
             isolated_op: IsolatedOp::Reject(RejectOpWith::Abort),
             ignore_leaks: false,

src/intptrcast.rs

@@ -107,19 +107,13 @@ impl<'mir, 'tcx> GlobalStateInner {
     }
 
     pub fn ptr_from_addr_transmute(
-        ecx: &MiriEvalContext<'mir, 'tcx>,
+        _ecx: &MiriEvalContext<'mir, 'tcx>,
         addr: u64,
     ) -> Pointer<Option<Tag>> {
         trace!("Transmuting {:#x} to a pointer", addr);
 
-        let provenance = if ecx.machine.allow_ptr_int_transmute {
-            // When we allow transmutes, treat them like casts: generating a wildcard pointer.
-            Some(Tag::Wildcard)
-        } else {
-            // Usually, we consider transmuted pointers to be "invalid" (`None` provenance).
-            None
-        };
-        Pointer::new(provenance, Size::from_bytes(addr))
+        // We consider transmuted pointers to be "invalid" (`None` provenance).
+        Pointer::new(None, Size::from_bytes(addr))
     }
 
     pub fn ptr_from_addr_cast(

src/machine.rs

@@ -259,13 +259,6 @@ pub struct Evaluator<'mir, 'tcx> {
     /// Whether to enforce the validity invariant.
     pub(crate) validate: bool,
 
-    /// Whether to allow uninitialized numbers (integers and floats).
-    pub(crate) allow_uninit_numbers: bool,
-
-    /// Whether to allow ptr2int transmutes, and whether to allow *dereferencing* the result of an
-    /// int2ptr transmute.
-    pub(crate) allow_ptr_int_transmute: bool,
-
     /// Whether to enforce [ABI](Abi) of function calls.
     pub(crate) enforce_abi: bool,
 
@@ -372,8 +365,6 @@ impl<'mir, 'tcx> Evaluator<'mir, 'tcx> {
             tls: TlsData::default(),
             isolated_op: config.isolated_op,
             validate: config.validate,
-            allow_uninit_numbers: config.allow_uninit_numbers,
-            allow_ptr_int_transmute: config.allow_ptr_int_transmute,
             enforce_abi: config.check_abi,
             file_handler: FileHandler::new(config.mute_stdout_stderr),
             dir_handler: Default::default(),
@@ -526,13 +517,13 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
     }
 
     #[inline(always)]
-    fn enforce_number_init(ecx: &MiriEvalContext<'mir, 'tcx>) -> bool {
-        !ecx.machine.allow_uninit_numbers
+    fn enforce_number_init(_ecx: &MiriEvalContext<'mir, 'tcx>) -> bool {
+        true
     }
 
     #[inline(always)]
-    fn enforce_number_no_provenance(ecx: &MiriEvalContext<'mir, 'tcx>) -> bool {
-        !ecx.machine.allow_ptr_int_transmute
+    fn enforce_number_no_provenance(_ecx: &MiriEvalContext<'mir, 'tcx>) -> bool {
+        true
     }
 
     #[inline(always)]