libc: uncomment items that were commented due to old ctest#4682
Merged
tgross35 merged 1 commit intorust-lang:mainfrom Sep 6, 2025
Merged
libc: uncomment items that were commented due to old ctest#4682tgross35 merged 1 commit intorust-lang:mainfrom
tgross35 merged 1 commit intorust-lang:mainfrom
Conversation
mbyx
force-pushed
the
libc-fix-gerando-bugs
branch
2 times, most recently
from
20ddb7a to
329b56f
Compare
tgross35
reviewed
Sep 5, 2025
src/primitives.rs
Outdated
Comment on lines
146
to
173
| // FIXME(ctest): ctest doesn't handle `_` as an identifier so these tests are temporarily | ||
| // disabled. | ||
| // macro_rules! static_assert_eq { | ||
| // ($a:expr, $b:expr) => { | ||
| // const _: [(); $a] = [(); $b]; | ||
| // }; | ||
| // } | ||
| macro_rules! static_assert_eq { | ||
| ($a:expr, $b:expr) => { | ||
| const _: [(); $a] = [(); $b]; | ||
| }; | ||
| } | ||
|
|
||
| // Since Rust doesn't officially guarantee that these types | ||
| // have compatible ABIs, we const assert that these values have the | ||
| // known size/align of the target platform's libc. If rustc ever | ||
| // tries to regress things, it will cause a compilation error. | ||
| // | ||
| // // Since Rust doesn't officially guarantee that these types | ||
| // // have compatible ABIs, we const assert that these values have the | ||
| // // known size/align of the target platform's libc. If rustc ever | ||
| // // tries to regress things, it will cause a compilation error. | ||
| // // | ||
| // // This isn't a bullet-proof solution because e.g. it doesn't | ||
| // // catch the fact that llvm and gcc disagree on how x64 __int128 | ||
| // // is actually *passed* on the stack (clang underaligns it for | ||
| // // the same reason that rustc *never* properly aligns it). | ||
| // static_assert_eq!(size_of::<__int128>(), _SIZE_128); | ||
| // static_assert_eq!(align_of::<__int128>(), _ALIGN_128); | ||
|
|
||
| // static_assert_eq!(size_of::<__uint128>(), _SIZE_128); | ||
| // static_assert_eq!(align_of::<__uint128>(), _ALIGN_128); | ||
|
|
||
| // static_assert_eq!(size_of::<__int128_t>(), _SIZE_128); | ||
| // static_assert_eq!(align_of::<__int128_t>(), _ALIGN_128); | ||
|
|
||
| // static_assert_eq!(size_of::<__uint128_t>(), _SIZE_128); | ||
| // static_assert_eq!(align_of::<__uint128_t>(), _ALIGN_128); | ||
| // This isn't a bullet-proof solution because e.g. it doesn't | ||
| // catch the fact that llvm and gcc disagree on how x64 __int128 | ||
| // is actually *passed* on the stack (clang underaligns it for | ||
| // the same reason that rustc *never* properly aligns it). | ||
| static_assert_eq!(size_of::<__int128>(), _SIZE_128); | ||
| static_assert_eq!(align_of::<__int128>(), _ALIGN_128); | ||
|
|
||
| static_assert_eq!(size_of::<__uint128>(), _SIZE_128); | ||
| static_assert_eq!(align_of::<__uint128>(), _ALIGN_128); | ||
|
|
||
| static_assert_eq!(size_of::<__int128_t>(), _SIZE_128); | ||
| static_assert_eq!(align_of::<__int128_t>(), _ALIGN_128); | ||
|
|
||
| static_assert_eq!(size_of::<__uint128_t>(), _SIZE_128); | ||
| static_assert_eq!(align_of::<__uint128_t>(), _ALIGN_128); |
Contributor
There was a problem hiding this comment.
This whole bit can actually be deleted, also the entire "This introduces partial support for FFI with __int128..." section above. The mentioned ABI issue has since been resolved, and since rust-lang/rust#137306 we say i128 will be compatible with __i128 on platforms where it is available.
Should resolve the test failure.
Contributor
Author
There was a problem hiding this comment.
The other error is related to debug_assert, I'm not sure where to put the import, since putting it at the top will make it unused on some platforms.
Contributor
There was a problem hiding this comment.
I guess just do core::debug_assert!, same for any other needed imports here. The style thing should be fixed, but I don't think it's really worth worrying about
mbyx
force-pushed
the
libc-fix-gerando-bugs
branch
7 times, most recently
from
8c5c27a to
eedba5c
Compare
tgross35
reviewed
Sep 6, 2025
Comment on lines
131
to
134
| /// C `__int128` (a GCC extension that's part of many ABIs) | ||
| pub type __int128 = i128; | ||
| /// C `unsigned __int128` (a GCC extension that's part of many ABIs) | ||
| pub type __uint128 = u128; |
Contributor
There was a problem hiding this comment.
These should probably be kept under the above #[cfg(all(...))] gate
mbyx
force-pushed
the
libc-fix-gerando-bugs
branch
from
eedba5c to
7806bb2
Compare
tgross35
reviewed
Sep 6, 2025
Contributor
There was a problem hiding this comment.
Sorry for the confusion; to clarify a bit, for #4682 (comment) I only meant that the quoted bit (long explanation + checks) can be deleted. __u?int128(_t)? need to stay around on the same platforms, so the cfg_if block needs to stay.
This should let you drop the build.rs changes
mbyx
force-pushed
the
libc-fix-gerando-bugs
branch
from
7806bb2 to
29dfcb5
Compare
mbyx
force-pushed
the
libc-fix-gerando-bugs
branch
from
29dfcb5 to
e68c4c5
Compare
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
tgross35
added
the
stable-nominated
tgross35
pushed a commit
to tgross35/rust-libc
that referenced
this pull request
Sep 23, 2025
(backport <rust-lang#4682>) (cherry picked from commit 61b722e) [ resolution needed for primitives - Trevor ]
tgross35
pushed a commit
to tgross35/rust-libc
that referenced
this pull request
Sep 23, 2025
(backport <rust-lang#4682>) (cherry picked from commit 61b722e) [ resolution needed for primitives - Trevor ]
Merged
tgross35
added
stable-applied
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Description
Sources
Checklist
libc-test/semverhave been updated*LASTor*MAXareincluded (see #3131)
cd libc-test && cargo test --target mytarget);especially relevant for platforms that may not be checked in CI