Skip to content

Commit 942b741

Browse files
committed
Auto merge of #149836 - matthiaskrgr:rollup-1ypvt7r, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - rust-lang/rust#147725 (Remove -Zoom=panic) - rust-lang/rust#148294 (callconv: fix mips64 aggregate argument passing for C FFI) - rust-lang/rust#148491 ( Correctly provide suggestions when encountering `async fn` with a `dyn Trait` return type) - rust-lang/rust#149458 (Run clippy on cg_gcc in CI) - rust-lang/rust#149679 (Restrict spe_acc to PowerPC SPE targets) - rust-lang/rust#149781 (Don't suggest wrapping attr in unsafe if it may come from proc macro) - rust-lang/rust#149795 (Use `let`...`else` instead of `match foo { ... _ => return };` and `if let ... else return` in std) - rust-lang/rust#149816 (Make typo in field and name suggestions verbose) - rust-lang/rust#149824 (Add a regression test for issue 145748) - rust-lang/rust#149826 (compiletest: tidy up `adb_path`/`adb_test_dir` handling) r? `@ghost` `@rustbot` modify labels: rollup
2 parents c729bbe + c514900 commit 942b741

File tree

3 files changed

+1
-32
lines changed

3 files changed

+1
-32
lines changed

src/shims/foreign_items.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
1212
use rustc_middle::mir::interpret::AllocInit;
1313
use rustc_middle::ty::{Instance, Ty};
1414
use rustc_middle::{mir, ty};
15-
use rustc_session::config::OomStrategy;
1615
use rustc_span::Symbol;
1716
use rustc_target::callconv::FnAbi;
1817
use rustc_target::spec::{Arch, Os};
@@ -305,18 +304,12 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
305304
// Here we dispatch all the shims for foreign functions. If you have a platform specific
306305
// shim, add it to the corresponding submodule.
307306
match link_name.as_str() {
308-
// Magic functions Rust emits (and not as part of the allocator shim).
307+
// Magic function Rust emits (and not as part of the allocator shim).
309308
name if name == this.mangle_internal_symbol(NO_ALLOC_SHIM_IS_UNSTABLE) => {
310309
// This is a no-op shim that only exists to prevent making the allocator shims
311310
// instantly stable.
312311
let [] = this.check_shim_sig_lenient(abi, CanonAbi::Rust, link_name, args)?;
313312
}
314-
name if name == this.mangle_internal_symbol(OomStrategy::SYMBOL) => {
315-
// Gets the value of the `oom` option.
316-
let [] = this.check_shim_sig_lenient(abi, CanonAbi::Rust, link_name, args)?;
317-
let val = this.tcx.sess.opts.unstable_opts.oom.should_panic();
318-
this.write_int(val, dest)?;
319-
}
320313

321314
// Miri-specific extern functions
322315
"miri_alloc" => {

tests/panic/alloc_error_handler_panic.rs

Lines changed: 0 additions & 18 deletions
This file was deleted.

tests/panic/alloc_error_handler_panic.stderr

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)