Merge branch 'dev' into dev2

daanx · daanx · commit 47c0f90849c5 · 2025-06-06T21:31:31.000-07:00
diff --git a/src/os.c b/src/os.c
@@ -355,8 +355,7 @@ void* _mi_os_alloc_aligned(size_t size, size_t alignment, bool commit, bool allo
 
   mi_assert_internal(memid->mem.os.size >= size);
   mi_assert_internal(_mi_is_aligned(p,alignment));
-  if (commit) { mi_assert_internal(memid->initially_committed); }
-  if (memid->initially_zero) { mi_assert_internal(memid->initially_committed); }
+  if (commit) { mi_assert_internal(memid->initially_committed); }  
   return p;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -355,8 +355,7 @@ void* _mi_os_alloc_aligned(size_t size, size_t alignment, bool commit, bool allo`
`355`	`355`
`356`	`356`	`mi_assert_internal(memid->mem.os.size >= size);`
`357`	`357`	`mi_assert_internal(_mi_is_aligned(p,alignment));`
`358`		`- if (commit) { mi_assert_internal(memid->initially_committed); }`
`359`		`- if (memid->initially_zero) { mi_assert_internal(memid->initially_committed); }`
	`358`	`+ if (commit) { mi_assert_internal(memid->initially_committed); }`
`360`	`359`	`return p;`
`361`	`360`	`}`
`362`	`361`