Fix build with #[unix_sigpipe = "..."] support in rustc
#2532
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Sep 3, 2022
|
Could you update the rust-version file? Right now it is still testing the old rustc.
I think further adjustment will be needed, since Miri needs to pass the right number of arguments to the start fn.
|
Enselic
force-pushed
the
fix-build-with-unix_sigpipe
branch
from
b9c13ef to
351d9bf
Compare
|
Yeah I was a bit rushed before and only tried to build and not run tests. Running tests revealed at least one more problem. This is not a complete solution though because tests are still failing locally for me, but it takes one more step in the right direction. Maybe I will find more time this evening to work on this. |
RalfJung
reviewed
Sep 3, 2022
src/eval.rs
Outdated
| @@ -301,10 +301,12 @@ pub fn create_ecx<'mir, 'tcx: 'mir>( | |||
| )?; | |||
| } | |||
| EntryFnType::Start => { | |||
| let sigpipe = 2; // Inlining of `DEFAULT` from https://github.com/rust-lang/rust/blob/master/compiler/rustc_session/src/config/sigpipe.rs | |||
| let sigpipe_arg = Scalar::from_u8(sigpipe); | |||
| ecx.call_function( | |||
There was a problem hiding this comment.
There's another call_function a few lines up, that one probably also needs to be adjusted.
There was a problem hiding this comment.
Oops, yes, I got it backwards in my head, I should change that place instead of this place.
All tests pass locally for me now, hopefully it all works in CI too.
Edit: CI passed 🥳
Enselic
force-pushed
the
fix-build-with-unix_sigpipe
branch
from
351d9bf to
c011126
Compare
|
Thanks!
@bors r+
|
|
☀️ Test successful - checks-actions |
Closed
23 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes rust-lang/rust#101352
CC @RalfJung @oli-obk