Merge branch 'dev' of https://github.com/microsoft/mimalloc into dev

daanx · daanx · commit bb957fcd81ba · 2021-06-07T17:00:35.000-07:00
diff --git a/src/os.c b/src/os.c
@@ -113,7 +113,7 @@ size_t _mi_os_good_alloc_size(size_t size) {
   else if (size < 8*MiB) align_size = 256*KiB;
   else if (size < 32*MiB) align_size = 1*MiB;
   else align_size = 4*MiB;
-  if (size >= (SIZE_MAX - align_size)) return size; // possible overflow?
+  if (mi_unlikely(size >= (SIZE_MAX - align_size))) return size; // possible overflow?
   return _mi_align_up(size, align_size);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ size_t _mi_os_good_alloc_size(size_t size) {`
`113`	`113`	`else if (size < 8MiB) align_size = 256KiB;`
`114`	`114`	`else if (size < 32MiB) align_size = 1MiB;`
`115`	`115`	`else align_size = 4*MiB;`
`116`		`- if (size >= (SIZE_MAX - align_size)) return size; // possible overflow?`
	`116`	`+ if (mi_unlikely(size >= (SIZE_MAX - align_size))) return size; // possible overflow?`
`117`	`117`	`return _mi_align_up(size, align_size);`
`118`	`118`	`}`
`119`	`119`