-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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
avoid using aligned_alloc; posix_memalign is better-behaved #125003
Conversation
Is this rounding even still necessary? Looking at the code, I don't see any indication that the size has to be a multiple of the alignment... but also going back in the history I can't see such a requirement, so maybe I am looking at the wrong thing. Cc @sunfishcode Or... should we just use |
Even emmalloc seems to have posix_memalign, so I think we should just use that. |
That code in wasi-libc is unmodified upstream musl code, so all musl targets presumably behave the same way. On the standards side, the behavior of |
Yeah I since realized this rounding up the size was added only for emmalloc, not for the default wasi-libc allocator.
Correct, it's not been UB since C18 so the old arguments don't apply any more. emmalloc still decides not to support allocations when the size is not a multiple of the alignment, but only when called via aligned_alloc -- as far as I can tell, there's no good reason for that; it supports such requests just fine when they happen via posix_memalign. aligned_alloc also has the strange requirement that the memory must always be sufficiently aligned for types with fundamental alignment that fit into the requested size... I don't see emmalloc actually do that, but the code is too much for me to follow. We don't rely on that, though, so this wouldn't affect us. |
Using (It also seems reasonable that it should now relax that check in |
I tried to find out why we're using a different function on wasi, and I think it's just a historic coincidence. The commit that added wasi support used aligned_alloc, and then later this got merged with the other Unix codepaths but without changing which function gets called where. So there's no indication here that using posix_memalign on wasi would be a bad idea. r? @cuviper |
@bors r+ rollup |
avoid using aligned_alloc; posix_memalign is better-behaved Also there's no reason why wasi should be different than all the other Unixes here.
The job Click to see the possible cause of the failure (guessed by this bot)
|
💔 Test failed - checks-actions |
@bors retry |
Rollup of 5 pull requests Successful merges: - rust-lang#125003 (avoid using aligned_alloc; posix_memalign is better-behaved) - rust-lang#125142 (Migrate `run-make/rustdoc-themes` to new rmake.rs) - rust-lang#125146 (Migrate `run-make/panic-impl-transitive` to `rmake`) - rust-lang#125154 (Small improvements to the documentaion of FnAbi ) - rust-lang#125159 (Meta: Allow unauthenticated users to modify `L-*`, `PG-*` and `-Z*` labels) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of rust-lang#125003 - RalfJung:aligned_alloc, r=cuviper avoid using aligned_alloc; posix_memalign is better-behaved Also there's no reason why wasi should be different than all the other Unixes here.
Rustup Pulls in rust-lang/rust#125003 so allocation tests should now work on wasm.
Rustup, aligned heap-allocations on wasm Pulls in rust-lang/rust#125003 so allocation tests should now work on wasm.
Rustup, aligned heap-allocations on wasm Pulls in rust-lang/rust#125003 so allocation tests should now work on wasm.
Rustup, aligned heap-allocations on wasm Pulls in rust-lang#125003 so allocation tests should now work on wasm.
Update Rust toolchain from nightly-2024-05-15 to nightly-2024-05-16 without any other source changes. This is an automatically generated pull request. If any of the CI checks fail, manual intervention is required. In such a case, review the changes at https://github.com/rust-lang/rust from rust-lang@8387315 up to rust-lang@1871252. The log for this commit range is: rust-lang@1871252fc8 Auto merge of rust-lang#125164 - fmease:rollup-s5vwzlg, r=fmease rust-lang@734a109998 Rollup merge of rust-lang#125159 - fmease:allow-unauth-labels-l-pg-z, r=jieyouxu rust-lang@601e5d199f Rollup merge of rust-lang#125154 - FractalFir:fnabi_doc, r=compiler-errors rust-lang@09156291e5 Rollup merge of rust-lang#125146 - Oneirical:panic-impl, r=jieyouxu rust-lang@80f991e09b Rollup merge of rust-lang#125142 - GuillaumeGomez:migrate-rustdoc-themes, r=jieyouxu rust-lang@c5b17ec9d2 Rollup merge of rust-lang#125003 - RalfJung:aligned_alloc, r=cuviper rust-lang@257d222e4b Improved the documentation of the FnAbi struct rust-lang@72a48fc68c Allow unauthenticated users to modify `L-*`, `PG-*` and `-Z*` labels rust-lang@b21b74b5e6 Auto merge of rust-lang#125134 - compiler-errors:negative-traits-are-not-notable, r=fmease rust-lang@a7484d2e49 fix tidy rust-lang@cae17ff42b rewrite panic-impl-transitive rust-lang@ade234d574 Auto merge of rust-lang#125144 - fmease:rollup-4uft293, r=fmease rust-lang@8d38f2fb11 Rollup merge of rust-lang#125137 - RalfJung:mir-sh, r=scottmcm rust-lang@2659ff3882 Rollup merge of rust-lang#125104 - Oneirical:test6, r=jieyouxu rust-lang@4f7d9d4ad8 Rollup merge of rust-lang#125038 - ivan-shrimp:checked_sub, r=joboet rust-lang@2804d4223b Rollup merge of rust-lang#125027 - Oneirical:c-test-with-remove, r=jieyouxu rust-lang@2e70bea168 Rollup merge of rust-lang#124975 - lu-zero:move_file, r=clubby789 rust-lang@3873a74f8a Rollup merge of rust-lang#124307 - reitermarkus:escape-debug-size-hint-inline, r=joboet rust-lang@3cb0030fe9 Auto merge of rust-lang#123413 - petrochenkov:delegmulti2, r=fmease rust-lang@c765480efe Migrate `run-make/rustdoc-themes` to new rmake rust-lang@c87ae947eb Add new `htmldocck` function to `run-make-support` rust-lang@a71c3ffce9 Auto merge of rust-lang#125032 - compiler-errors:crash-dump-dir, r=onur-ozkan rust-lang@0afd50e852 MIR operators: clarify Shl/Shr handling of negative offsets rust-lang@44fa5fd39a Auto merge of rust-lang#125136 - matthiaskrgr:rollup-ljm15m3, r=matthiaskrgr rust-lang@5f1a120ee5 Rollup merge of rust-lang#125135 - chenyukang:yukang-fix-116502, r=compiler-errors rust-lang@f7c2934420 Rollup merge of rust-lang#125132 - mejrs:diag, r=compiler-errors rust-lang@a8ff937b07 Rollup merge of rust-lang#125108 - Zalathar:info-bitmap-bytes, r=nnethercote rust-lang@03ff673dcc Rollup merge of rust-lang#124990 - fmease:expand-weak-aliases-within-cts, r=compiler-errors rust-lang@75895f59b0 Fix the dedup error because of spans from suggestion rust-lang@9e7aff7945 Auto merge of rust-lang#125031 - Oneirical:dynamic-libs, r=jieyouxu rust-lang@8994840f7e rustdoc: Negative impls are not notable rust-lang@91a3f04a3f fix the test rust-lang@0160bff4b1 Auto merge of rust-lang#125084 - Jules-Bertholet:fix-125058, r=Nadrieril rust-lang@c30b41012d delegation: Implement list delegation rust-lang@18d7411719 Add `on_unimplemented" typo suggestions rust-lang@81f7e54962 Port issue-11908 to rmake rust-lang@1f61cc3078 port no-cdylib-as-rdylib test rust-lang@b1e5e5161a remove cxx_flags rust-lang@1f5837ae25 rewrite c-link-to-rust-staticlib rust-lang@5cc020d3df avoid using aligned_alloc; posix_memalign is better-behaved rust-lang@c81be68fb4 coverage: Remove confusing comments from `CoverageKind` rust-lang@bfadc3a9b9 coverage: `CoverageIdsInfo::mcdc_bitmap_bytes` is never needed rust-lang@fe8f66e4bc `rustc_hir_typeck`: Account for `skipped_ref_pats` in `expr_use_visitor` rust-lang@4db00fe229 Use an helper to move the files rust-lang@7fde7308bf reverse condition in `uN::checked_sub` rust-lang@848f3c2c6e Make crashes dump mir to build dir rust-lang@35a5be2833 Also expand weak alias tys inside consts inside `expand_weak_alias_tys` rust-lang@4edf12d33e Improve escape methods. rust-lang@16981ba406 Avoid panicking branch in `EscapeIterInner`. rust-lang@e3fc97be2b Inline `EscapeDebug::size_hint`. Co-authored-by: celinval <35149715+celinval@users.noreply.github.com> Co-authored-by: Zyad Hassan <88045115+zhassan-aws@users.noreply.github.com>
Also there's no reason why wasi should be different than all the other Unixes here.