diff options
| author | Anatol Belski <ab@php.net> | 2014-11-26 08:17:35 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-11-26 08:17:35 +0100 |
| commit | 3ca0ca1548324e8993e0707dfaf67a8cb58a0fb2 (patch) | |
| tree | ed14da274390f69bc4235a1f21121cfe8b370144 /Zend/zend_variables.c | |
| parent | 4f3ac2cdbedf7a84d64bfee7405f0c023641a806 (diff) | |
| parent | 108b2c4bb993f7bd3855a801f71175fd65c6828a (diff) | |
| download | php-git-3ca0ca1548324e8993e0707dfaf67a8cb58a0fb2.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (102 commits)
fix dir separator in test
fix TS build
fix TS build
Better fix for bug #68446
Revert "Merge remote-tracking branch 'origin/PHP-5.6'"
Revert NEWS and set test to XFAIL
Revert "Fix bug #68446 (bug with constant defaults and type hints)"
Improved zend_hash_clean() and added new optimized zend_symtable_clean()
Use inline version of zval_ptr_dtor()
Added new optimized zend_array_destroy() function
Moved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h
fix REGISTER_NS_*_CONSTANT macros
Removed useless assert. EG(uninitialized_zval) can't be refcounted.
Use specialized destructors when types of zvals are known.
move tests into proper place
Improved assignment to object property
Reuse zend_assign_to_variable() in zend_std_write_property()
cleanup comments from svn/cvs era
fix dir separator in test
fork test for windows
...
Diffstat (limited to 'Zend/zend_variables.c')
| -rw-r--r-- | Zend/zend_variables.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index aae8465791..548d191cfd 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -45,7 +45,7 @@ ZEND_API void _zval_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC) /* break possible cycles */ GC_TYPE(arr) = IS_NULL; GC_REMOVE_FROM_BUFFER(arr); - zend_hash_destroy(&arr->ht); + zend_array_destroy(&arr->ht TSRMLS_CC); efree_size(arr, sizeof(zend_array)); } break; @@ -77,7 +77,9 @@ ZEND_API void _zval_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC) case IS_REFERENCE: { zend_reference *ref = (zend_reference*)p; if (--GC_REFCOUNT(ref) == 0) { - zval_ptr_dtor(&ref->val); + TSRMLS_FETCH(); + + i_zval_ptr_dtor(&ref->val ZEND_FILE_LINE_RELAY_CC TSRMLS_CC); efree_size(ref, sizeof(zend_reference)); } break; @@ -105,7 +107,7 @@ ZEND_API void _zval_dtor_func_for_ptr(zend_refcounted *p ZEND_FILE_LINE_DC) /* break possible cycles */ GC_TYPE(arr) = IS_NULL; GC_REMOVE_FROM_BUFFER(arr); - zend_hash_destroy(&arr->ht); + zend_array_destroy(&arr->ht TSRMLS_CC); efree_size(arr, sizeof(zend_array)); } break; @@ -134,8 +136,9 @@ ZEND_API void _zval_dtor_func_for_ptr(zend_refcounted *p ZEND_FILE_LINE_DC) } case IS_REFERENCE: { zend_reference *ref = (zend_reference*)p; + TSRMLS_FETCH(); - zval_ptr_dtor(&ref->val); + i_zval_ptr_dtor(&ref->val ZEND_FILE_LINE_RELAY_CC TSRMLS_CC); efree_size(ref, sizeof(zend_reference)); break; } @@ -293,7 +296,9 @@ ZEND_API void _zval_internal_dtor_wrapper(zval *zvalue) ZEND_API void _zval_ptr_dtor_wrapper(zval *zval_ptr) { - zval_ptr_dtor(zval_ptr); + TSRMLS_FETCH(); + + i_zval_ptr_dtor(zval_ptr ZEND_FILE_LINE_CC TSRMLS_CC); } |