summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-09-21 14:56:14 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-09-21 14:56:14 +0200
commit3642592a121dad939983a43d3de986fbc7c92da9 (patch)
treee753acdacaee65e04128a8d5343f24ae140aac9c
parent8e0789a21c3218efbb58417b45a7c36649a606d6 (diff)
downloadphp-git-3642592a121dad939983a43d3de986fbc7c92da9.tar.gz
Remove unnecessary check
We should only produce IS_UNDEF if an exception is thrown, this check is not needed.
-rw-r--r--Zend/zend_interfaces.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c
index 1278f08209..0d5af66d92 100644
--- a/Zend/zend_interfaces.c
+++ b/Zend/zend_interfaces.c
@@ -153,19 +153,7 @@ ZEND_API void zend_user_it_get_current_key(zend_object_iterator *_iter, zval *ke
{
zend_user_iterator *iter = (zend_user_iterator*)_iter;
zval *object = &iter->it.data;
- zval retval;
-
- zend_call_method_with_0_params(Z_OBJ_P(object), iter->ce, &iter->ce->iterator_funcs_ptr->zf_key, "key", &retval);
-
- if (Z_TYPE(retval) != IS_UNDEF) {
- ZVAL_COPY_VALUE(key, &retval);
- } else {
- if (!EG(exception)) {
- zend_error(E_WARNING, "Nothing returned from %s::key()", ZSTR_VAL(iter->ce->name));
- }
-
- ZVAL_LONG(key, 0);
- }
+ zend_call_method_with_0_params(Z_OBJ_P(object), iter->ce, &iter->ce->iterator_funcs_ptr->zf_key, "key", key);
}
/* }}} */