averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #66305 from mikeash/dont-cache-malloc-default-zone

Browse Source 
[Runtime] Don't cache malloc_default_zone.
This commit is contained in:
swift-ci
2023-06-06 22:35:57 -07:00
committed by GitHub
parent c74fd074c6 007ac9a129
commit e4debda4e3
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
stdlib/public/runtime/Heap.cpp
View File

@@ -60,13 +60,6 @@ static constexpr size_t MALLOC_ALIGN_MASK = alignof(std::max_align_t) - 1;
static_assert(_swift_MinAllocationAlignment > MALLOC_ALIGN_MASK, static_assert(_swift_MinAllocationAlignment > MALLOC_ALIGN_MASK,
"Swift's default alignment must exceed platform malloc mask."); "Swift's default alignment must exceed platform malloc mask.");
#if defined(__APPLE__) && SWIFT_STDLIB_HAS_DARWIN_LIBMALLOC
static inline malloc_zone_t *DEFAULT_ZONE() {
static malloc_zone_t *z = SWIFT_LAZY_CONSTANT(malloc_default_zone());
return z;
}
#endif
// When alignMask == ~(size_t(0)), allocation uses the "default" // When alignMask == ~(size_t(0)), allocation uses the "default"
// _swift_MinAllocationAlignment. This is different than calling swift_slowAlloc // _swift_MinAllocationAlignment. This is different than calling swift_slowAlloc
// with `alignMask == _swift_MinAllocationAlignment - 1` because it forces // with `alignMask == _swift_MinAllocationAlignment - 1` because it forces
@@ -91,11 +84,7 @@ void *swift::swift_slowAlloc(size_t size, size_t alignMask) {
void *p; void *p;
// This check also forces "default" alignment to use AlignedAlloc. // This check also forces "default" alignment to use AlignedAlloc.
if (alignMask <= MALLOC_ALIGN_MASK) { if (alignMask <= MALLOC_ALIGN_MASK) {
#if defined(__APPLE__) && SWIFT_STDLIB_HAS_DARWIN_LIBMALLOC
p = malloc_zone_malloc(DEFAULT_ZONE(), size);
#else
p = malloc(size); p = malloc(size);
#endif
} else { } else {
size_t alignment = computeAlignment(alignMask); size_t alignment = computeAlignment(alignMask);
p = AlignedAlloc(size, alignment); p = AlignedAlloc(size, alignment);
@@ -111,10 +100,10 @@ void *swift::swift_slowAllocTyped(size_t size, size_t alignMask,
void *p; void *p;
// This check also forces "default" alignment to use malloc_memalign(). // This check also forces "default" alignment to use malloc_memalign().
if (alignMask <= MALLOC_ALIGN_MASK) { if (alignMask <= MALLOC_ALIGN_MASK) {
p = malloc_type_zone_malloc(DEFAULT_ZONE(), size, typeId); p = malloc_type_malloc(size, typeId);
} else { } else {
size_t alignment = computeAlignment(alignMask); size_t alignment = computeAlignment(alignMask);
p = malloc_type_zone_memalign(DEFAULT_ZONE(), alignment, size, typeId); p = malloc_type_aligned_alloc(alignment, size, typeId);
} }
if (!p) swift::crash("Could not allocate memory."); if (!p) swift::crash("Could not allocate memory.");
return p; return p;
@@ -141,11 +130,7 @@ void *swift::swift_slowAllocTyped(size_t size, size_t alignMask,
// consistent with allocation with the same alignment. // consistent with allocation with the same alignment.
static void swift_slowDeallocImpl(void *ptr, size_t alignMask) { static void swift_slowDeallocImpl(void *ptr, size_t alignMask) {
if (alignMask <= MALLOC_ALIGN_MASK) { if (alignMask <= MALLOC_ALIGN_MASK) {
#if defined(__APPLE__) && SWIFT_STDLIB_HAS_DARWIN_LIBMALLOC
malloc_zone_free(DEFAULT_ZONE(), ptr);
#else
free(ptr); free(ptr);
#endif
} else { } else {
AlignedFree(ptr); AlignedFree(ptr);
} }