From c9988a1e698154dbf168792635c77496a29a6cc6 Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Sun, 20 Sep 2015 02:59:30 +0200 Subject: [PATCH] Remove superfluous branches --- Zend/zend_generators.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c index dfcc1343d2..3ffa82e3dd 100644 --- a/Zend/zend_generators.c +++ b/Zend/zend_generators.c @@ -65,15 +65,11 @@ static void zend_generator_cleanup_unfinished_execution(zend_generator *generato ZEND_API void zend_generator_close(zend_generator *generator, zend_bool finished_execution) /* {{{ */ { - if (EXPECTED(Z_TYPE(generator->value) != IS_UNDEF)) { - zval_ptr_dtor(&generator->value); - ZVAL_UNDEF(&generator->value); - } + zval_ptr_dtor(&generator->value); + ZVAL_UNDEF(&generator->value); - if (EXPECTED(Z_TYPE(generator->key) != IS_UNDEF)) { - zval_ptr_dtor(&generator->key); - ZVAL_UNDEF(&generator->key); - } + zval_ptr_dtor(&generator->key); + ZVAL_UNDEF(&generator->key); if (UNEXPECTED(Z_TYPE(generator->values) != IS_UNDEF)) { zval_ptr_dtor(&generator->values); @@ -931,7 +927,7 @@ ZEND_METHOD(Generator, getReturn) if (zend_parse_parameters_none() == FAILURE) { return; - } + } generator = (zend_generator *) Z_OBJ_P(getThis()); -- 2.50.0