kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-05 15:09:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove extern inline from alloc_new functions to avoid link warnings

Browse source
This commit is contained in:
Daan 2023-03-04 09:27:04 -08:00
parent cb4fc2c792
commit 0d9e7ab61e
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/alloc.c
View file

@ -922,7 +922,7 @@ static bool mi_try_new_handler(bool nothrow) {
} }
#endif #endif
static mi_decl_noinline void* mi_heap_try_new(mi_heap_t* heap, size_t size, bool nothrow ) { mi_decl_export mi_decl_noinline void* mi_heap_try_new(mi_heap_t* heap, size_t size, bool nothrow ) {
void* p = NULL; void* p = NULL;
while(p == NULL && mi_try_new_handler(nothrow)) { while(p == NULL && mi_try_new_handler(nothrow)) {
p = mi_heap_malloc(heap,size); p = mi_heap_malloc(heap,size);
@ -935,7 +935,7 @@ static mi_decl_noinline void* mi_try_new(size_t size, bool nothrow) {
} }
mi_decl_nodiscard mi_decl_restrict extern inline void* mi_heap_alloc_new(mi_heap_t* heap, size_t size) { mi_decl_nodiscard mi_decl_restrict void* mi_heap_alloc_new(mi_heap_t* heap, size_t size) {
void* p = mi_heap_malloc(heap,size); void* p = mi_heap_malloc(heap,size);
if mi_unlikely(p == NULL) return mi_heap_try_new(heap, size, false); if mi_unlikely(p == NULL) return mi_heap_try_new(heap, size, false);
return p; return p;
@ -946,7 +946,7 @@ mi_decl_nodiscard mi_decl_restrict void* mi_new(size_t size) {
} }
mi_decl_nodiscard mi_decl_restrict extern inline void* mi_heap_alloc_new_n(mi_heap_t* heap, size_t count, size_t size) { mi_decl_nodiscard mi_decl_restrict void* mi_heap_alloc_new_n(mi_heap_t* heap, size_t count, size_t size) {
size_t total; size_t total;
if mi_unlikely(mi_count_size_overflow(count, size, &total)) { if mi_unlikely(mi_count_size_overflow(count, size, &total)) {
mi_try_new_handler(false); // on overflow we invoke the try_new_handler once to potentially throw std::bad_alloc mi_try_new_handler(false); // on overflow we invoke the try_new_handler once to potentially throw std::bad_alloc
@ -1019,8 +1019,8 @@ void* _mi_externs[] = {
(void*)&mi_zalloc_small, (void*)&mi_zalloc_small,
(void*)&mi_heap_malloc, (void*)&mi_heap_malloc,
(void*)&mi_heap_zalloc, (void*)&mi_heap_zalloc,
(void*)&mi_heap_malloc_small, (void*)&mi_heap_malloc_small
(void*)&mi_heap_alloc_new, // (void*)&mi_heap_alloc_new,
(void*)&mi_heap_alloc_new_n // (void*)&mi_heap_alloc_new_n
}; };
#endif #endif