]> granicus.if.org Git - php/commitdiff
Fixed C89 build
authorKalle Sommer Nielsen <kalle@php.net>
Wed, 17 Aug 2016 11:43:50 +0000 (13:43 +0200)
committerKalle Sommer Nielsen <kalle@php.net>
Wed, 17 Aug 2016 11:43:50 +0000 (13:43 +0200)
Zend/zend_generators.c

index f1cc09e9380b183d1e8ffe39b5b0798d96d62e4e..04fedbe2008bf6c1378f1f194214ade6ed243f44 100644 (file)
@@ -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) {