Merge branch 'PHP-8.1' into PHP-8.2

Author: bwoebi

Zend/tests/gh9916-012.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Bug GH-9916 012 (Entering shutdown sequence with a fiber suspended in a Generator emits an unavoidable fatal error or crashes)
+--FILE--
+<?php
+
+$gen = (function() {
+    yield from (function() { yield; })();
+})();
+$fiber = new Fiber(function() use ($gen) {
+    $gen->current();
+});
+$fiber->start();
+
+?>
+==DONE==
+--EXPECT--
+==DONE==

Zend/zend_generators.c

@@ -765,7 +765,7 @@ ZEND_API void zend_generator_resume(zend_generator *orig_generator) /* {{{ */
 			zend_observer_fcall_end(generator->execute_data, &generator->value);
 		}
 	}
-	generator->flags &= ~ZEND_GENERATOR_CURRENTLY_RUNNING;
+	generator->flags &= ~(ZEND_GENERATOR_CURRENTLY_RUNNING | ZEND_GENERATOR_IN_FIBER);
 
 	generator->frozen_call_stack = NULL;
 	if (EXPECTED(generator->execute_data) &&
@@ -805,7 +805,6 @@ ZEND_API void zend_generator_resume(zend_generator *orig_generator) /* {{{ */
 		goto try_again;
 	}
 
-	generator->flags &= ~ZEND_GENERATOR_IN_FIBER;
 	orig_generator->flags &= ~ZEND_GENERATOR_DO_INIT;
 }
 /* }}} */