Skip to content

Commit 9d42038

Browse files
drop redundant zend_mm_heap_free()
1 parent 82f3923 commit 9d42038

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

Zend/zend_alloc.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3137,11 +3137,6 @@ ZEND_API zend_mm_heap *zend_mm_get_heap(void)
31373137
return AG(mm_heap);
31383138
}
31393139

3140-
ZEND_API void zend_mm_heap_free(zend_mm_heap *heap)
3141-
{
3142-
zend_mm_chunk_free(heap, heap->main_chunk, ZEND_MM_CHUNK_SIZE);
3143-
}
3144-
31453140
ZEND_API bool zend_mm_is_custom_heap(zend_mm_heap *new_heap)
31463141
{
31473142
#if ZEND_MM_CUSTOM

Zend/zend_alloc.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@ ZEND_API size_t ZEND_FASTCALL _zend_mm_block_size(zend_mm_heap *heap, void *p ZE
263263
#define zend_mm_realloc2_rel(heap, p, size, copy_size) _zend_mm_realloc2((heap), (p), (size), (copy_size) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
264264
#define zend_mm_block_size_rel(heap, p) _zend_mm_block_size((heap), (p) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
265265

266-
ZEND_API void zend_mm_heap_free(zend_mm_heap* heap);
267266
ZEND_API zend_mm_heap *zend_mm_set_heap(zend_mm_heap *new_heap);
268267
ZEND_API zend_mm_heap *zend_mm_get_heap(void);
269268

ext/zend_test/zend_mm_custom_handlers.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,15 @@ void zend_test_mm_custom_handlers_shutdown(void)
125125
return;
126126
}
127127
zend_mm_set_heap(ZT_G(original_heap));
128-
zend_mm_heap_free(ZT_G(observed_heap));
128+
zend_mm_set_custom_handlers(
129+
ZT_G(observed_heap),
130+
NULL,
131+
NULL,
132+
NULL,
133+
NULL,
134+
NULL
135+
);
136+
zend_mm_shutdown(ZT_G(observed_heap), true, true);
129137
ZT_G(observed_heap) = NULL;
130138
printf("Prev heap at %p restored in ZendMM\n", ZT_G(original_heap));
131139
}

0 commit comments

Comments
 (0)