Skip to content

Fix build with #[unix_sigpipe = "..."] support in rustc #2532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2022
Merged

Fix build with #[unix_sigpipe = "..."] support in rustc #2532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9353538c7bea6edb245457712cec720305c4576e
8c6ce6b91b172f77c795a74bfeaf74b865146b3f
11 changes: 9 additions & 2 deletions src/eval.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ pub fn create_ecx<'mir, 'tcx: 'mir>(
// Call start function.

match entry_type {
EntryFnType::Main => {
EntryFnType::Main { .. } => {
let start_id = tcx.lang_items().start_fn().unwrap();
let main_ret_ty = tcx.fn_sig(entry_id).output();
let main_ret_ty = main_ret_ty.no_bound_vars().unwrap();
Expand All @@ -292,10 +292,17 @@ pub fn create_ecx<'mir, 'tcx: 'mir>(

let main_ptr = ecx.create_fn_alloc_ptr(FnVal::Instance(entry_instance));

let sigpipe = 2; // Inlining of `DEFAULT` from https://github.com/rust-lang/rust/blob/master/compiler/rustc_session/src/config/sigpipe.rs

ecx.call_function(
start_instance,
Abi::Rust,
&[Scalar::from_pointer(main_ptr, &ecx).into(), argc.into(), argv],
&[
Scalar::from_pointer(main_ptr, &ecx).into(),
argc.into(),
argv,
Scalar::from_u8(sigpipe).into(),
],
Some(&ret_place.into()),
StackPopCleanup::Root { cleanup: true },
)?;
Expand Down