diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-03-19 17:00:28 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-03-19 17:00:28 +0400 |
| commit | b7938ab1bd765897bd6f08a48a8aea494a961ea9 (patch) | |
| tree | 22f8034d42dfac8f03b4bb6d6573e5a7f6361ac8 /Zend/zend_execute.h | |
| parent | 2e3e96b24bb1c547362af53b952f823f451e6bce (diff) | |
| download | php-git-b7938ab1bd765897bd6f08a48a8aea494a961ea9.tar.gz | |
Refactored GC (incomplete)
Diffstat (limited to 'Zend/zend_execute.h')
| -rw-r--r-- | Zend/zend_execute.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index 5c9651feb8..10bc3f8c23 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -79,8 +79,7 @@ static zend_always_inline void i_zval_ptr_dtor(zval *zval_ptr ZEND_FILE_LINE_DC (type != IS_STRING || !IS_INTERNED(Z_STR_P(zval_ptr)))) { if (!Z_DELREF_P(zval_ptr)) { ZEND_ASSERT(zval_ptr != &EG(uninitialized_zval)); - GC_REMOVE_ZVAL_FROM_BUFFER(zval_ptr); - _zval_dtor_func_for_ptr(zval_ptr ZEND_FILE_LINE_CC); + _zval_dtor_func_for_ptr(Z_COUNTED_P(zval_ptr) ZEND_FILE_LINE_CC); } else { if (Z_REFCOUNT_P(zval_ptr) == 1 && Z_TYPE_P(zval_ptr) == IS_REFERENCE) { /* convert reference to regular value */ @@ -98,8 +97,7 @@ static zend_always_inline void i_zval_ptr_dtor_nogc(zval *zval_ptr ZEND_FILE_LIN if (Z_REFCOUNTED_P(zval_ptr)) { if (!Z_DELREF_P(zval_ptr)) { ZEND_ASSERT(zval_ptr != &EG(uninitialized_zval)); - GC_REMOVE_ZVAL_FROM_BUFFER(zval_ptr); - _zval_dtor_func_for_ptr(zval_ptr ZEND_FILE_LINE_CC); + _zval_dtor_func_for_ptr(Z_COUNTED_P(zval_ptr) ZEND_FILE_LINE_CC); } else { if (Z_REFCOUNT_P(zval_ptr) == 1 && Z_TYPE_P(zval_ptr) == IS_REFERENCE) { /* convert reference to regular value */ |