Skip to content
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.

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

Fix size/align of ucontext_t on aarch64-apple-darwin #3312

Merged
merged 1 commit into from Aug 17, 2023

Conversation

alexcrichton
Copy link
Member

@alexcrichton alexcrichton commented Aug 2, 2023

This commit effectively reverts #2817. Currently ucontext_t has both the wrong size and the wrong alignment for aarch64-apple-darwin which causes problems for users referencing the structure 1. The issue linked from #2817 claimed that it fixed #2812 but that's still an issue where FFI warnings are still emitted for usage of ucontext_t due to its transitive usage of u128. I'm not sure how to fix #2812 myself, but given that #2817 doesn't appear to solve its original intent and additionally the size/align are currently wrong this commit reverts in the meantime.

This commit effectively reverts rust-lang#2817. Currently `ucontext_t` has both
the wrong size and the wrong alignment for aarch64-apple-darwin which
causes problems for users referencing the structure [1]. The issue
linked from rust-lang#2817 claimed that it fixed rust-lang#2812 but that's still an issue
where FFI warnings are still emitted for usage of `ucontext_t` due to
its transitive usage of `u128`. I'm not sure how to fix rust-lang#2812 myself,
but given that rust-lang#2817 doesn't appear to solve its original intent and
additionally the size/align are currently wrong this commit reverts in
the meantime.

[1]: bytecodealliance/wasmtime#6785 (comment)
@rustbot
Copy link
Collaborator

rustbot commented Aug 2, 2023

r? @JohnTitor

(rustbot has picked a reviewer for you, use r? to override)

@JohnTitor
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Aug 15, 2023

📌 Commit 283ef4b has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Aug 15, 2023

⌛ Testing commit 283ef4b with merge 66beada...

bors added a commit that referenced this pull request Aug 15, 2023
…ohnTitor

Fix size/align of `ucontext_t` on aarch64-apple-darwin

This commit effectively reverts #2817. Currently `ucontext_t` has both the wrong size and the wrong alignment for aarch64-apple-darwin which causes problems for users referencing the structure [1]. The issue linked from #2817 claimed that it fixed #2812 but that's still an issue where FFI warnings are still emitted for usage of `ucontext_t` due to its transitive usage of `u128`. I'm not sure how to fix #2812 myself, but given that #2817 doesn't appear to solve its original intent and additionally the size/align are currently wrong this commit reverts in the meantime.

[1]: bytecodealliance/wasmtime#6785 (comment)
@bors
Copy link
Contributor

bors commented Aug 15, 2023

💥 Test timed out

@JohnTitor
Copy link
Member

@bors retry

@bors
Copy link
Contributor

bors commented Aug 17, 2023

⌛ Testing commit 283ef4b with merge cd4fc66...

@bors
Copy link
Contributor

bors commented Aug 17, 2023

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing cd4fc66 to main...

@bors bors merged commit cd4fc66 into rust-lang:main Aug 17, 2023
2 of 11 checks passed
@alexcrichton alexcrichton deleted the fix-aarch64-darwin-ucontext-t branch November 8, 2023 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Aarch64 macOS: ucontext_t is not FFI-Safe
4 participants