com php-src: Fixed C89 build: Zend/zend_generators.c
| From: | Kalle Sommer Nielsen | Date: | Wed, 17 Aug 2016 11:43:50 +0000 |
| Subject: | com php-src: Fixed C89 build: Zend/zend_generators.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93885@lists.php.net to get a copy of this message | ||
Commit: 8a1fbdda43ed3b36b9331aee1eaace3d961caee9
Author: Kalle Sommer Nielsen <kalle@php.net> Wed, 17 Aug 2016 13:43:50 +0200
Parents: 06c0540b901baf2fcfea2256f3d83c5907aab703
Branches: PHP-7.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8a1fbdda43ed3b36b9331aee1eaace3d961caee9
Log:
Fixed C89 build
Changed paths:
M Zend/zend_generators.c
Diff:
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index f1cc09e..04fedbe 100644
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -297,6 +297,8 @@ ZEND_API zend_execute_data *zend_generator_check_placeholder_frame(zend_execute_
static void zend_generator_throw_exception(zend_generator *generator, zval *exception)
{
+ zend_execute_data *original_execute_data = EG(current_execute_data);
+
/* if we don't stop an array/iterator yield from, the exception will only reach the generator
after the values were all iterated over */
if (UNEXPECTED(Z_TYPE(generator->values) != IS_UNDEF)) {
zval_ptr_dtor(&generator->values);
@@ -305,7 +307,6 @@ static void zend_generator_throw_exception(zend_generator *generator, zval *exce
/* Throw the exception in the context of the generator. Decrementing the opline
* to pretend the exception happened during the YIELD opcode. */
- zend_execute_data *original_execute_data = EG(current_execute_data);
EG(current_execute_data) = generator->execute_data;
generator->execute_data->opline--;
if (exception) {