|
38 | 38 |
|
39 | 39 | #include <stdbool.h>
|
40 | 40 |
|
| 41 | +static const zval collections_empty_entry_list[1]; |
| 42 | + |
41 | 43 | /* Common functionality */
|
42 | 44 | #define CONVERT_OFFSET_TO_LONG_OR_THROW(index, zv) do { \
|
43 | 45 | if (Z_TYPE_P(offset_zv) != IS_LONG) { \
|
@@ -108,7 +110,7 @@ static void DEBUG_ASSERT_CONSISTENT_DEQUE(const collections_deque_entries *array
|
108 | 110 | const uint32_t capacity = collections_deque_entries_get_capacity(array);
|
109 | 111 | ZEND_ASSERT(array->size <= capacity);
|
110 | 112 | ZEND_ASSERT(array->offset < capacity || capacity == 0);
|
111 |
| - ZEND_ASSERT(array->mask == 0 || (array->circular_buffer != NULL && array->circular_buffer != empty_entry_list)); |
| 113 | + ZEND_ASSERT(array->mask == 0 || (array->circular_buffer != NULL && array->circular_buffer != collections_empty_entry_list)); |
112 | 114 | ZEND_ASSERT(collections_is_valid_uint32_capacity(capacity));
|
113 | 115 | ZEND_ASSERT(array->circular_buffer != NULL || ((array->size == 0 && array->offset == 0) || capacity == 0));
|
114 | 116 | }
|
@@ -193,7 +195,7 @@ static void collections_deque_entries_init_from_array(collections_deque_entries
|
193 | 195 | i++;
|
194 | 196 | } ZEND_HASH_FOREACH_END();
|
195 | 197 | } else {
|
196 |
| - array->circular_buffer = (zval *)empty_entry_list; |
| 198 | + array->circular_buffer = (zval *)collections_empty_entry_list; |
197 | 199 | }
|
198 | 200 | }
|
199 | 201 |
|
@@ -269,7 +271,7 @@ static void collections_deque_entries_copy_ctor(collections_deque_entries *to, c
|
269 | 271 | to->mask = 0;
|
270 | 272 | to->offset = 0;
|
271 | 273 | if (!size) {
|
272 |
| - to->circular_buffer = (zval *)empty_entry_list; |
| 274 | + to->circular_buffer = (zval *)collections_empty_entry_list; |
273 | 275 | return;
|
274 | 276 | }
|
275 | 277 |
|
@@ -501,7 +503,7 @@ PHP_METHOD(Collections_Deque, __construct)
|
501 | 503 | intern->array.offset = 0;
|
502 | 504 | intern->array.size = 0;
|
503 | 505 | intern->array.mask = 0;
|
504 |
| - intern->array.circular_buffer = (zval *)empty_entry_list; |
| 506 | + intern->array.circular_buffer = (zval *)collections_empty_entry_list; |
505 | 507 | return;
|
506 | 508 | }
|
507 | 509 |
|
@@ -629,7 +631,7 @@ PHP_METHOD(Collections_Deque, __unserialize)
|
629 | 631 | array->offset = 0;
|
630 | 632 | array->size = 0;
|
631 | 633 | array->mask = 0;
|
632 |
| - array->circular_buffer = (zval *)empty_entry_list; |
| 634 | + array->circular_buffer = (zval *)collections_empty_entry_list; |
633 | 635 | return;
|
634 | 636 | }
|
635 | 637 |
|
|
0 commit comments