summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2019-03-12 22:19:36 +0300
committerDmitry Stogov <dmitry@zend.com>2019-03-12 22:19:36 +0300
commit4111daf2b496e462304390c0018ea2b4eafe785b (patch)
tree49cc2e4fd79b5e7b6d36e454e8c6289eb1ab29c7
parentdbb462db5d55d77dcc63237e4e33e315bd2cbd4d (diff)
parent824a9333987805cdaacc99589763a9f93b72633a (diff)
downloadphp-git-4111daf2b496e462304390c0018ea2b4eafe785b.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Better data packing
-rw-r--r--Zend/zend_gc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c
index fbb636d71a..f999a4dd10 100644
--- a/Zend/zend_gc.c
+++ b/Zend/zend_gc.c
@@ -183,12 +183,13 @@ typedef struct _gc_root_buffer {
} gc_root_buffer;
typedef struct _zend_gc_globals {
+ gc_root_buffer *buf; /* preallocated arrays of buffers */
+
zend_bool gc_enabled;
zend_bool gc_active; /* GC currently running, forbid nested GC */
zend_bool gc_protected; /* GC protected, forbid root additions */
zend_bool gc_full;
- gc_root_buffer *buf; /* preallocated arrays of buffers */
uint32_t unused; /* linked list of unused buffers */
uint32_t first_unused; /* first unused buffer */
uint32_t gc_threshold; /* GC collection threshold */