diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-29 11:52:55 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-29 17:15:19 +0200 |
commit | 45a0656e9589eff0908067aba5a18026eec51231 (patch) | |
tree | 749cc6a5ed1a94c00af05f7502c2be10248deeed /Zend/zend_execute.c | |
parent | 693955c5c534ac6ef7a3785e9731a1e9f6e3c2fa (diff) | |
download | php-git-45a0656e9589eff0908067aba5a18026eec51231.tar.gz |
Remove get() object handler
Now that set() is gone, there is little point in keeping get(), as
it is essentially just a different way of writing cast_object()
now.
Closes GH-4202.
Diffstat (limited to 'Zend/zend_execute.c')
-rw-r--r-- | Zend/zend_execute.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index bf4a8e224a..e031fa412e 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1296,15 +1296,6 @@ static zend_never_inline void zend_binary_assign_op_obj_dim(zval *object, zval * if ((z = Z_OBJ_HT_P(object)->read_dimension(Z_OBJ_P(object), property, BP_VAR_R, &rv)) != NULL) { - if (Z_TYPE_P(z) == IS_OBJECT && Z_OBJ_HT_P(z)->get) { - zval rv2; - zval *value = Z_OBJ_HT_P(z)->get(Z_OBJ_P(z), &rv2); - - if (z == &rv) { - zval_ptr_dtor(&rv); - } - ZVAL_COPY_VALUE(z, value); - } if (binary_op(&res, z, value) == SUCCESS) { Z_OBJ_HT_P(object)->write_dimension(Z_OBJ_P(object), property, &res); } @@ -1783,15 +1774,6 @@ static zend_never_inline void zend_post_incdec_overloaded_property(zend_object * return; } - if (UNEXPECTED(Z_TYPE_P(z) == IS_OBJECT) && Z_OBJ_HT_P(z)->get) { - zval rv2; - zval *value = Z_OBJ_HT_P(z)->get(Z_OBJ_P(z), &rv2); - if (z == &rv) { - zval_ptr_dtor(&rv); - } - ZVAL_COPY_VALUE(z, value); - } - ZVAL_COPY_DEREF(&z_copy, z); ZVAL_COPY(EX_VAR(opline->result.var), &z_copy); if (inc) { @@ -1821,15 +1803,6 @@ static zend_never_inline void zend_pre_incdec_overloaded_property(zend_object *o return; } - if (UNEXPECTED(Z_TYPE_P(z) == IS_OBJECT) && Z_OBJ_HT_P(z)->get) { - zval rv2; - zval *value = Z_OBJ_HT_P(z)->get(Z_OBJ_P(z), &rv2); - - if (z == &rv) { - zval_ptr_dtor(&rv); - } - ZVAL_COPY_VALUE(z, value); - } ZVAL_COPY_DEREF(&z_copy, z); if (inc) { increment_function(&z_copy); @@ -1859,15 +1832,6 @@ static zend_never_inline void zend_assign_op_overloaded_property(zend_object *ob } return; } - if (Z_TYPE_P(z) == IS_OBJECT && Z_OBJ_HT_P(z)->get) { - zval rv2; - zval *value = Z_OBJ_HT_P(z)->get(Z_OBJ_P(z), &rv2); - - if (z == &rv) { - zval_ptr_dtor(&rv); - } - ZVAL_COPY_VALUE(z, value); - } if (binary_op(&res, z, value) == SUCCESS) { object->handlers->write_property(object, name, &res, cache_slot); } |