Merge branch 'dev' into dev-slice

This commit is contained in:
daanx 2023-05-19 09:12:59 -07:00
commit 2f8fb6aade
3 changed files with 33 additions and 5 deletions

View file

@ -201,9 +201,9 @@ mi_heap_t* _mi_heap_main_get(void) {
// note: in x64 in release build `sizeof(mi_thread_data_t)` is under 4KiB (= OS page size).
typedef struct mi_thread_data_s {
mi_heap_t heap; // must come first due to cast in `_mi_heap_done`
mi_heap_t heap; // must come first due to cast in `_mi_heap_done`
mi_tld_t tld;
mi_memid_t memid;
mi_memid_t memid; // must come last due to zero'ing
} mi_thread_data_t;
@ -249,7 +249,7 @@ static mi_thread_data_t* mi_thread_data_zalloc(void) {
}
if (td != NULL && !is_zero) {
_mi_memzero_aligned(td, sizeof(*td));
_mi_memzero_aligned(td, offsetof(mi_thread_data_t,memid));
}
return td;
}