diff options
| author | Nikita Popov <nikic@php.net> | 2014-09-03 15:16:32 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-09-03 15:18:06 +0200 |
| commit | 9e753531842f524a1a147ca0244c041e59ecd117 (patch) | |
| tree | 77f1dbf101b5012bb986f178cdd5379f67b84ec0 /Zend/zend_compile.c | |
| parent | c52511c30703d2921f813ccf1557bc042a7cd9d2 (diff) | |
| download | php-git-9e753531842f524a1a147ca0244c041e59ecd117.tar.gz | |
Use zval_ptr_dtor_nogc to destroy literals
Also move the definition of zval_ptr_dtor_nogc to zend_variables.h
(from zend_execute.h/.c) as it's used in a few places.
Diffstat (limited to 'Zend/zend_compile.c')
| -rw-r--r-- | Zend/zend_compile.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 0b42f9597b..a5a32298d5 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -600,10 +600,7 @@ void zend_do_free(znode *op1 TSRMLS_DC) /* {{{ */ /* Destroy value without using GC: When opcache moves arrays into SHM it will * free the zend_array structure, so references to it from outside the op array * become invalid. GC would cause such a reference in the root buffer. */ - zval *zv = &op1->u.constant; - if (Z_REFCOUNTED_P(zv) && !Z_DELREF_P(zv)) { - _zval_dtor_func_for_ptr(Z_COUNTED_P(zv) ZEND_FILE_LINE_CC); - } + zval_ptr_dtor_nogc(&op1->u.constant); } } /* }}} */ |