Use debug version of malloc when ASSERTIONS=1. NFC #23330
Merged
+21
−11
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
kripken
approved these changes
Jan 8, 2025
Merged
|
Changelog updated. |
sbc100
force-pushed
the
malloc_debug
branch
3 times, most recently
from
94ef6a9 to
c0bf5c9
Compare
sbc100
force-pushed
the
malloc_debug
branch
2 times, most recently
from
79f1dd0 to
f940575
Compare
sbc100
added a commit
to sbc100/emscripten
that referenced
this pull request
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.
sbc100
added a commit
to sbc100/emscripten
that referenced
this pull request
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.
sbc100
added a commit
to sbc100/emscripten
that referenced
this pull request
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.
sbc100
added a commit
to sbc100/emscripten
that referenced
this pull request
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.
sbc100
added a commit
that referenced
this pull request
Jan 10, 2025
For some reason emscripten was overriding `MALLINFO_FIELD_TYPE` to be `int` even though this defaults `size_t` and `size_t` is what linux uses, and `size_t` allows for correct reporting of numbers larger than 2^32. What is worse, the `MALLINFO_FIELD_TYPE` override was only applied 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 #23330. This change was spit out from #23330.
Previously we were only using it with `ASSERTIONS=2`. The debug version dlmalloc has a lot very useful checks. Enabling this found a few real issues in our test code. Fixes: emscripten-core#23360
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.
Previously we were only using it with
ASSERTIONS=2.The debug version dlmalloc has many very useful checks, including checking for double-free. This is something that is done by glibc malloc even in release builds. It seems reasonable that we should do this basic checking in our debug builds at least.
Required fixing two genuine bugs: One double-free in test code and one invalid free in embind.
Fixes: #23360