diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-08-14 17:51:26 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-08-14 17:51:35 +0200 |
| commit | 1166359acbaee296d3e067374c878182d8a241e3 (patch) | |
| tree | ce7a08db13da318529042aac5098b6a013d7d14e /Zend | |
| parent | e5da73d1f259080a9135390f1fcbfaa8a63c06b5 (diff) | |
| parent | fcabe7e5e44067319f9c4123d71a7cea6a823af4 (diff) | |
| download | php-git-1166359acbaee296d3e067374c878182d8a241e3.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_generators.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c index d3fa86b414..a18a1e8849 100644 --- a/Zend/zend_generators.c +++ b/Zend/zend_generators.c @@ -271,7 +271,7 @@ static uint32_t calc_gc_buffer_size(zend_generator *generator) /* {{{ */ if (EX_CALL_INFO() & ZEND_CALL_FREE_EXTRA_ARGS) { size += EX_NUM_ARGS() - op_array->num_args; } - size += Z_TYPE(execute_data->This) == IS_OBJECT; /* $this */ + size += (EX_CALL_INFO() & ZEND_CALL_RELEASE_THIS) != 0; /* $this */ size += (EX_CALL_INFO() & ZEND_CALL_CLOSURE) != 0; /* Closure object */ /* Live vars */ @@ -352,7 +352,7 @@ static HashTable *zend_generator_get_gc(zval *object, zval **table, int *n) /* { } } - if (Z_TYPE(execute_data->This) == IS_OBJECT) { + if (EX_CALL_INFO() & ZEND_CALL_RELEASE_THIS) { ZVAL_OBJ(gc_buffer++, Z_OBJ(execute_data->This)); } if (EX_CALL_INFO() & ZEND_CALL_CLOSURE) { |