Merge pull request #4758 from rust-lang/rustup-2025-12-11

Automatic Rustup

Author: RalfJung

rust-version

@@ -1 +1 @@
-36b2369c91d32c2659887ed6fe3d570640f44fd2
+f5209000832c9d3bc29c91f4daef4ca9f28dc797

src/shims/foreign_items.rs

@@ -12,7 +12,6 @@ use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc_middle::mir::interpret::AllocInit;
 use rustc_middle::ty::{Instance, Ty};
 use rustc_middle::{mir, ty};
-use rustc_session::config::OomStrategy;
 use rustc_span::Symbol;
 use rustc_target::callconv::FnAbi;
 use rustc_target::spec::{Arch, Os};
@@ -305,18 +304,12 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
         // Here we dispatch all the shims for foreign functions. If you have a platform specific
         // shim, add it to the corresponding submodule.
         match link_name.as_str() {
-            // Magic functions Rust emits (and not as part of the allocator shim).
+            // Magic function Rust emits (and not as part of the allocator shim).
             name if name == this.mangle_internal_symbol(NO_ALLOC_SHIM_IS_UNSTABLE) => {
                 // This is a no-op shim that only exists to prevent making the allocator shims
                 // instantly stable.
                 let [] = this.check_shim_sig_lenient(abi, CanonAbi::Rust, link_name, args)?;
             }
-            name if name == this.mangle_internal_symbol(OomStrategy::SYMBOL) => {
-                // Gets the value of the `oom` option.
-                let [] = this.check_shim_sig_lenient(abi, CanonAbi::Rust, link_name, args)?;
-                let val = this.tcx.sess.opts.unstable_opts.oom.should_panic();
-                this.write_int(val, dest)?;
-            }
 
             // Miri-specific extern functions
             "miri_alloc" => {