Always use size_t in dlmalloc's mallinfo
#23368
Merged
Conversation
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
kripken
approved these changes
Jan 10, 2025
Member
kripken
left a comment
kripken
left a comment
There was a problem hiding this comment.
Is it worth a changelog notice? I guess wasm64 users will get an error if they use the mallinfo struct, but it's clear how to fix it?
Collaborator
Author
|
Added ChangeLog entry. |
kripken
reviewed
Jan 10, 2025
kripken
approved these changes
Jan 10, 2025
For some reason emscrpiten was overriding MALLINFO_FIELD_TYPE to be int even though this defaults size_t and size_t is the document type in the man page, and size_t allows for correct reporting of numbers larger than 2^32. What is worse the `MALLINFO_FIELD_TYPE` override was only place when `DLMALLOC_DEBUG` was defined which meant that `MALLINFO_FIELD_TYPE` varied between `-sASSERTIONS=1` and `-sASSERTIONS=2` builds of dlmalloc. This means that `-sMEMORY64 + -sASSERTIONS=2` builds of dlmalloc were simply broken WRT `mallinfo` since the public definition of mallinfo disagreed with the dlmalloc-internal version. I verified that the follow tests fails without this change: EMCC_CFLAGS=-sASSERTIONS=2 ./test/runner wasm64.test_mallinfo I'm not updating the actual test code here since test coverage will be coming in emscripten-core#23330. This change was spit out from emscripten-core#23330.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
For some reason emscripten was overriding
MALLINFO_FIELD_TYPEto beinteven though this defaultssize_tandsize_tis what linux uses, andsize_tallows for correct reporting of numbers larger than 2^32.What is worse, the
MALLINFO_FIELD_TYPEoverride was only applied whenDLMALLOC_DEBUGwas defined which meant thatMALLINFO_FIELD_TYPEvaried between-sASSERTIONS=1and-sASSERTIONS=2builds of dlmalloc!This means that
-sMEMORY64 + -sASSERTIONS=2builds of dlmalloc were simply broken WRTmallinfosince the public definition of mallinfo disagreed with the dlmalloc-internal version.I verified that the follow tests fails without this change:
EMCC_CFLAGS=-sASSERTIONS=2 ./test/runner wasm64.test_mallinfoI'm not updating the actual test code here since test coverage will be coming in #23330.
This change was spit out from #23330.