diff options
| author | bors <bors@rust-lang.org> | 2024-04-24 13:02:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-24 13:02:04 +0000 |
| commit | f3dfaa73168a1d68c6e9cabcea42639381bb5a9d (patch) | |
| tree | a672562ce4c07078df65b5ebbdbeb94c42c95ad9 | |
| parent | c1073fb36ec452da49060187326434122baa742c (diff) | |
| parent | aa19679ff08ea2a3d165aa66d4ddd0bdae8c3392 (diff) | |
| download | rust-f3dfaa73168a1d68c6e9cabcea42639381bb5a9d.tar.gz rust-f3dfaa73168a1d68c6e9cabcea42639381bb5a9d.zip | |
Auto merge of #3510 - RalfJung:sigpipe-default, r=RalfJung
unix_sigpipe: don't inline DEFAULT, just use it from rustc The default anyway changed since this code was written... it's now 0, not 2.
| -rw-r--r-- | src/tools/miri/src/eval.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/tools/miri/src/eval.rs b/src/tools/miri/src/eval.rs index d74cd5ff3e2..2242768a568 100644 --- a/src/tools/miri/src/eval.rs +++ b/src/tools/miri/src/eval.rs @@ -386,10 +386,9 @@ pub fn create_ecx<'mir, 'tcx: 'mir>( let main_ptr = ecx.fn_ptr(FnVal::Instance(entry_instance)); - // Inlining of `DEFAULT` from - // https://github.com/rust-lang/rust/blob/master/compiler/rustc_session/src/config/sigpipe.rs. // Always using DEFAULT is okay since we don't support signals in Miri anyway. - let sigpipe = 2; + // (This means we are effectively ignoring `#[unix_sigpipe]`.) + let sigpipe = rustc_session::config::sigpipe::DEFAULT; ecx.call_function( start_instance, |