diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-09-20 02:59:30 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-09-20 02:59:30 +0200 |
| commit | c9988a1e698154dbf168792635c77496a29a6cc6 (patch) | |
| tree | 309d91f60ea4f031cd1b991ea349f657056e5a28 | |
| parent | 95dbe1d03e0b7609af65235928123527c917f6a8 (diff) | |
| download | php-git-c9988a1e698154dbf168792635c77496a29a6cc6.tar.gz | |
Remove superfluous branches
| -rw-r--r-- | Zend/zend_generators.c | 14 |
1 files 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()); |