Improve

Author: danog

Zend/zend_alloc.c

@@ -1398,7 +1398,7 @@ static zend_always_inline zend_mm_free_slot* zend_mm_decode_free_slot(zend_mm_he
 #endif
 }
 
-static zend_always_inline void zend_mm_set_next_free_slot(const char *from, zend_mm_heap *heap, uint32_t bin_num, zend_mm_free_slot *slot, zend_mm_free_slot *next)
+static zend_always_inline void zend_mm_set_next_free_slot(zend_mm_heap *heap, uint32_t bin_num, zend_mm_free_slot *slot, zend_mm_free_slot *next)
 {
 	ZEND_ASSERT(bin_data_size[bin_num] >= ZEND_MM_MIN_USEABLE_BIN_SIZE);
 
@@ -1450,6 +1450,8 @@ static zend_never_inline void *zend_mm_alloc_small_slow(zend_mm_heap *heap, uint
 		/* insufficient memory */
 		return NULL;
 	}
+	// bin is poisoned, do not unpoision inside this function
+	// zend_mm_set_next_free_slot automatically unpoisons and repoisons before return
 
 	chunk = (zend_mm_chunk*)ZEND_MM_ALIGNED_BASE(bin, ZEND_MM_CHUNK_SIZE);
 
@@ -1465,13 +1467,12 @@ static zend_never_inline void *zend_mm_alloc_small_slow(zend_mm_heap *heap, uint
 		} while (i < bin_pages[bin_num]);
 	}
 	ZEND_MM_POISON_CHUNK_HDR(chunk, heap);
-	ZEND_MM_UNPOISON_HEAP(heap);
 
 	/* create a linked list of elements from 1 to last */
 	end = (zend_mm_free_slot*)((char*)bin + (bin_data_size[bin_num] * (bin_elements[bin_num] - 1)));
 	heap->free_slot[bin_num] = p = (zend_mm_free_slot*)((char*)bin + bin_data_size[bin_num]);
 	do {
-		zend_mm_set_next_free_slot("alloc_small", heap, bin_num, p, (zend_mm_free_slot*)((char*)p + bin_data_size[bin_num]));
+		zend_mm_set_next_free_slot(heap, bin_num, p, (zend_mm_free_slot*)((char*)p + bin_data_size[bin_num]));
 #if ZEND_DEBUG
 		do {
 			zend_mm_debug_info *dbg = (zend_mm_debug_info*)((char*)p + bin_data_size[bin_num] - ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_debug_info)));
@@ -1482,7 +1483,7 @@ static zend_never_inline void *zend_mm_alloc_small_slow(zend_mm_heap *heap, uint
 		p = (zend_mm_free_slot*)((char*)p + bin_data_size[bin_num]);
 	} while (p != end);
 
-	zend_mm_set_next_free_slot("alloc_small", heap, bin_num, p, NULL);
+	zend_mm_set_next_free_slot(heap, bin_num, p, NULL);
 
 #if ZEND_DEBUG
 		do {
@@ -1536,7 +1537,7 @@ static zend_always_inline void zend_mm_free_small(zend_mm_heap *heap, void *ptr,
 #endif
 
 	p = (zend_mm_free_slot*)ptr;
-	zend_mm_set_next_free_slot("free_small", heap, bin_num, p, heap->free_slot[bin_num]);
+	zend_mm_set_next_free_slot(heap, bin_num, p, heap->free_slot[bin_num]);
 	heap->free_slot[bin_num] = p;
 
 	ZEND_MM_POISON(p, bin_data_size[bin_num]);
@@ -2291,7 +2292,7 @@ ZEND_API size_t zend_mm_gc(zend_mm_heap *heap)
 				if (q == (zend_mm_free_slot*)&heap->free_slot[i]) {
 					q->next_free_slot = p;
 				} else {
-					zend_mm_set_next_free_slot("gc", heap, i, q, p);
+					zend_mm_set_next_free_slot(heap, i, q, p);
 				}
 			} else {
 				q = p;