Skip to content

Commit f3dfaa7

Browse files
committed
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.
2 parents c1073fb + aa19679 commit f3dfaa7

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/tools/miri/src/eval.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -386,10 +386,9 @@ pub fn create_ecx<'mir, 'tcx: 'mir>(
386386

387387
let main_ptr = ecx.fn_ptr(FnVal::Instance(entry_instance));
388388

389-
// Inlining of `DEFAULT` from
390-
// https://github.com/rust-lang/rust/blob/master/compiler/rustc_session/src/config/sigpipe.rs.
391389
// Always using DEFAULT is okay since we don't support signals in Miri anyway.
392-
let sigpipe = 2;
390+
// (This means we are effectively ignoring `#[unix_sigpipe]`.)
391+
let sigpipe = rustc_session::config::sigpipe::DEFAULT;
393392

394393
ecx.call_function(
395394
start_instance,

0 commit comments

Comments
 (0)