Cheri-research/snmalloc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix on macOS.

Browse Source 
Fixes an issue where the global placeholder allocator was being
released.
This commit is contained in:
David Chisnall
2019-07-08 19:24:56 +01:00
parent 8d216dca3e
commit 3a0cdc05a5
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mem/threadalloc.h
View File

@@ -125,7 +125,11 @@ namespace snmalloc
*/
~ThreadAllocThreadDestructor()
{
current_alloc_pool()->release(alloc);
if (alloc != &GlobalPlaceHolder)
{
current_alloc_pool()->release(alloc);
alloc = &GlobalPlaceHolder;
}
}
public:
@@ -172,8 +176,11 @@ namespace snmalloc
*pp = nullptr;
// Actually destroy the allocator and reset TLS
Alloc*& alloc = ThreadAllocExplicitTLSCleanup::get();
current_alloc_pool()->release(alloc);
alloc = &GlobalPlaceHolder;
if (alloc != &GlobalPlaceHolder)
{
current_alloc_pool()->release(alloc);
alloc = &GlobalPlaceHolder;
}
}
# ifdef _WIN32
@@ -314,6 +321,7 @@ namespace snmalloc
return local_alloc;
}
local_alloc = current_alloc_pool()->acquire();
assert(local_alloc != &GlobalPlaceHolder);
ThreadAlloc::register_cleanup();
return local_alloc;
}