diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-05-28 20:10:02 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-05-28 20:10:02 +0300 |
| commit | 83804519dffcbb23ef689b37816ee28f2c3192e0 (patch) | |
| tree | 52b774b523002e442a938cefed6476e63188405e /Zend/zend_object_handlers.c | |
| parent | 071b389bc6da9c6dc33e798806a0da63fc1cedf6 (diff) | |
| download | php-git-83804519dffcbb23ef689b37816ee28f2c3192e0.tar.gz | |
Replace ZVAL_COPY() and ZVAL_COPY_VALUE() for IS_OBJECT by cheaper macros
Diffstat (limited to 'Zend/zend_object_handlers.c')
| -rw-r--r-- | Zend/zend_object_handlers.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 8a75c51de6..2c1d5ec555 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -915,7 +915,8 @@ ZEND_API zval *zend_std_read_dimension(zval *object, zval *offset, int type, zva ZVAL_COPY_DEREF(&tmp_offset, offset); } - ZVAL_COPY(&tmp_object, object); + Z_ADDREF_P(object); + ZVAL_OBJ(&tmp_object, Z_OBJ_P(object)); if (type == BP_VAR_IS) { zend_call_method_with_1_params(&tmp_object, ce, NULL, "offsetexists", rv, &tmp_offset); if (UNEXPECTED(Z_ISUNDEF_P(rv))) { @@ -962,7 +963,8 @@ ZEND_API void zend_std_write_dimension(zval *object, zval *offset, zval *value) } else { ZVAL_COPY_DEREF(&tmp_offset, offset); } - ZVAL_COPY(&tmp_object, object); + Z_ADDREF_P(object); + ZVAL_OBJ(&tmp_object, Z_OBJ_P(object)); zend_call_method_with_2_params(&tmp_object, ce, NULL, "offsetset", NULL, &tmp_offset, value); zval_ptr_dtor(&tmp_object); zval_ptr_dtor(&tmp_offset); @@ -980,7 +982,8 @@ ZEND_API int zend_std_has_dimension(zval *object, zval *offset, int check_empty) if (EXPECTED(instanceof_function_ex(ce, zend_ce_arrayaccess, 1) != 0)) { ZVAL_COPY_DEREF(&tmp_offset, offset); - ZVAL_COPY(&tmp_object, object); + Z_ADDREF_P(object); + ZVAL_OBJ(&tmp_object, Z_OBJ_P(object)); zend_call_method_with_1_params(&tmp_object, ce, NULL, "offsetexists", &retval, &tmp_offset); result = i_zend_is_true(&retval); zval_ptr_dtor(&retval); @@ -1136,7 +1139,8 @@ ZEND_API void zend_std_unset_dimension(zval *object, zval *offset) /* {{{ */ if (instanceof_function_ex(ce, zend_ce_arrayaccess, 1)) { ZVAL_COPY_DEREF(&tmp_offset, offset); - ZVAL_COPY(&tmp_object, object); + Z_ADDREF_P(object); + ZVAL_OBJ(&tmp_object, Z_OBJ_P(object)); zend_call_method_with_1_params(&tmp_object, ce, NULL, "offsetunset", NULL, &tmp_offset); zval_ptr_dtor(&tmp_object); zval_ptr_dtor(&tmp_offset); |