Prevent dtor of generator in suspended fiber

Zend/tests/gh9916-001.phpt

@@ -0,0 +1,27 @@
+--TEST--
+Bug GH-9916 001 (Entering shutdown sequence with a fiber suspended in a Generator emits an unavoidable fatal error or crashes)
+--FILE--
+<?php
+$gen = (function() {
+    $x = new stdClass;
+    try {
+        print "Before suspend\n";
+        Fiber::suspend();
+        print "Not executed";
+        yield;
+    } finally {
+        print "Finally\n";
+    }
+    print "Not executed";
+})();
+$fiber = new Fiber(function() use ($gen, &$fiber) {
+    $gen->current();
+    print "Not executed";
+});
+$fiber->start();
+?>
+==DONE==
+--EXPECT--
+Before suspend
+==DONE==
+Finally

Zend/tests/gh9916-002.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Bug GH-9916 002 (Entering shutdown sequence with a fiber suspended in a Generator emits an unavoidable fatal error or crashes)
+--FILE--
+<?php
+$gen = (function() {
+    $x = new stdClass;
+    print "Before suspend\n";
+    Fiber::suspend();
+    print "Not executed\n";
+    yield;
+})();
+$fiber = new Fiber(function() use ($gen, &$fiber) {
+    $gen->current();
+    print "Not executed";
+});
+$fiber->start();
+?>
+==DONE==
+--EXPECT--
+Before suspend
+==DONE==

Zend/tests/gh9916-003.phpt

@@ -0,0 +1,36 @@
+--TEST--
+Bug GH-9916 003 (Entering shutdown sequence with a fiber suspended in a Generator emits an unavoidable fatal error or crashes)
+--FILE--
+<?php
+$gen = (function() {
+    $x = new stdClass;
+    try {
+        yield from (function () {
+            $x = new stdClass;
+            try {
+                print "Before suspend\n";
+                Fiber::suspend();
+                print "Not executed\n";
+                yield;
+            } finally {
+                print "Finally (inner)\n";
+            }
+        })();
+        print "Not executed\n";
+        yield;
+    } finally {
+        print "Finally\n";
+    }
+})();
+$fiber = new Fiber(function() use ($gen, &$fiber) {
+    $gen->current();
+    print "Not executed";
+});
+$fiber->start();
+?>
+==DONE==
+--EXPECT--
+Before suspend
+==DONE==
+Finally (inner)
+Finally

Zend/tests/gh9916-004.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Bug GH-9916 004 (Entering shutdown sequence with a fiber suspended in a Generator emits an unavoidable fatal error or crashes)
+--FILE--
+<?php
+$gen = (function() {
+    $x = new stdClass;
+    yield from (function () {
+        $x = new stdClass;
+        print "Before suspend\n";
+        Fiber::suspend();
+        print "Not executed\n";
+        yield;
+    })();
+    print "Not executed\n";
+    yield;
+})();
+$fiber = new Fiber(function() use ($gen, &$fiber) {
+    $gen->current();
+    print "Not executed";
+});
+$fiber->start();
+?>
+==DONE==
+--EXPECT--
+Before suspend
+==DONE==

Zend/tests/gh9916-005.phpt

@@ -0,0 +1,25 @@
+--TEST--
+Bug GH-9916 005 (Entering shutdown sequence with a fiber suspended in a Generator emits an unavoidable fatal error or crashes)
+--FILE--
+<?php
+$gen = (function() {
+    $x = new stdClass;
+    $fiber = yield;
+    print "Before suspend\n";
+    Fiber::suspend();
+    yield;
+})();
+$fiber = new Fiber(function() use ($gen, &$fiber) {
+    $gen->send($fiber);
+    $gen->current();
+});
+$fiber->start();
+
+$gen = null;
+$fiber = null;
+gc_collect_cycles();
+?>
+==DONE==
+--EXPECT--
+Before suspend
+==DONE==

Zend/tests/gh9916-006.phpt

@@ -0,0 +1,37 @@
+--TEST--
+Bug GH-9916 006 (Entering shutdown sequence with a fiber suspended in a Generator emits an unavoidable fatal error or crashes)
+--FILE--
+<?php
+$gen = (function() {
+    $x = new stdClass;
+    yield from (function () {
+        $x = new stdClass;
+        print "Before suspend\n";
+        Fiber::suspend();
+        print "After suspend\n";
+        yield;
+    })();
+    yield from (function () {
+        $x = new stdClass;
+        print "Before exit\n";
+        exit;
+        print "Not executed\n";
+        yield;
+    })();
+    yield;
+})();
+$fiber = new Fiber(function() use ($gen, &$fiber) {
+    $gen->current();
+    print "Fiber return\n";
+});
+$fiber->start();
+$fiber->resume();
+$gen->next();
+$gen->current();
+?>
+==DONE==
+--EXPECT--
+Before suspend
+After suspend
+Fiber return
+Before exit

Zend/tests/gh9916-007.phpt

@@ -0,0 +1,57 @@
+--TEST--
+Bug GH-9916 007 (Entering shutdown sequence with a fiber suspended in a Generator emits an unavoidable fatal error or crashes)
+--FILE--
+<?php
+$it = new class implements Iterator
+{
+    public function current(): mixed
+    {
+        return null;
+    }
+
+    public function key(): mixed
+    {
+        return 0;
+    }
+
+    public function next(): void
+    {
+    }
+
+    public function rewind(): void
+    {
+        try {
+            print "Before suspend\n";
+            Fiber::suspend();
+            print "Not executed\n";
+        } finally {
+            print "Finally (iterator)\n";
+        }
+    }
+
+    public function valid(): bool
+    {
+        return true;
+    }
+};
+
+$gen = (function() use ($it) {
+    try {
+        yield from $it;
+        print "Not executed\n";
+    } finally {
+        print "Finally\n";
+    }
+})();
+$fiber = new Fiber(function() use ($gen, &$fiber) {
+    $gen->current();
+    print "Not executed";
+});
+$fiber->start();
+?>
+==DONE==
+--EXPECT--
+Before suspend
+==DONE==
+Finally (iterator)
+Finally

Zend/tests/gh9916-008.phpt

@@ -0,0 +1,47 @@
+--TEST--
+Bug GH-9916 008 (Entering shutdown sequence with a fiber suspended in a Generator emits an unavoidable fatal error or crashes)
+--FILE--
+<?php
+$it = new class implements Iterator
+{
+    public function current(): mixed
+    {
+        return null;
+    }
+
+    public function key(): mixed
+    {
+        return 0;
+    }
+
+    public function next(): void
+    {
+    }
+
+    public function rewind(): void
+    {
+        $x = new stdClass;
+        print "Before suspend\n";
+        Fiber::suspend();
+    }
+
+    public function valid(): bool
+    {
+        return true;
+    }
+};
+
+$gen = (function() use ($it) {
+    $x = new stdClass;
+    yield from $it;
+})();
+$fiber = new Fiber(function() use ($gen, &$fiber) {
+    $gen->current();
+    print "Not executed";
+});
+$fiber->start();
+?>
+==DONE==
+--EXPECT--
+Before suspend
+==DONE==

Zend/tests/gh9916-009.phpt

@@ -0,0 +1,35 @@
+--TEST--
+Bug GH-9916 009 (Entering shutdown sequence with a fiber suspended in a Generator emits an unavoidable fatal error or crashes)
+--FILE--
+<?php
+$gen = (function() {
+    $x = new stdClass;
+    try {
+        print "Before suspend\n";
+        Fiber::suspend();
+        print "Not executed\n";
+    } finally {
+        print "Finally\n";
+        yield from ['foo' => new stdClass];
+        print "Not executed\n";
+    }
+})();
+$fiber = new Fiber(function() use ($gen, &$fiber) {
+    $gen->current();
+    print "Not executed\n";
+});
+$fiber->start();
+?>
+==DONE==
+--EXPECTF--
+Before suspend
+==DONE==
+Finally
+
+Fatal error: Uncaught Error: Cannot use "yield from" in a force-closed generator in %s:%d
+Stack trace:
+#0 [internal function]: {closure}()
+#1 %s(%d): Generator->current()
+#2 [internal function]: {closure}()
+#3 {main}
+  thrown in %s on line %d

Zend/zend_generators.c

@@ -223,6 +223,14 @@ static void zend_generator_dtor_storage(zend_object *object) /* {{{ */
 	uint32_t op_num, try_catch_offset;
 	int i;
 
+	/* Generator is running in a suspended fiber.
+	 * Will be dtor during fiber dtor */
+	if (generator->flags & ZEND_GENERATOR_IN_FIBER) {
+		/* Prevent finally blocks from yielding */
+		generator->flags |= ZEND_GENERATOR_FORCED_CLOSE;
+		return;
+	}
+
 	/* leave yield from mode to properly allow finally execution */
 	if (UNEXPECTED(Z_TYPE(generator->values) != IS_UNDEF)) {
 		zval_ptr_dtor(&generator->values);
@@ -727,7 +735,8 @@ ZEND_API void zend_generator_resume(zend_generator *orig_generator) /* {{{ */
 	}
 
 	/* Resume execution */
-	generator->flags |= ZEND_GENERATOR_CURRENTLY_RUNNING;
+	generator->flags |= ZEND_GENERATOR_CURRENTLY_RUNNING
+						| (EG(active_fiber) ? ZEND_GENERATOR_IN_FIBER : 0);
 	if (!ZEND_OBSERVER_ENABLED) {
 		zend_execute_ex(generator->execute_data);
 	} else {
@@ -778,7 +787,7 @@ ZEND_API void zend_generator_resume(zend_generator *orig_generator) /* {{{ */
 		goto try_again;
 	}
 
-	orig_generator->flags &= ~ZEND_GENERATOR_DO_INIT;
+	orig_generator->flags &= ~(ZEND_GENERATOR_DO_INIT | ZEND_GENERATOR_IN_FIBER);
 }
 /* }}} */
 

Zend/zend_generators.h

@@ -92,6 +92,7 @@ static const zend_uchar ZEND_GENERATOR_CURRENTLY_RUNNING = 0x1;
 static const zend_uchar ZEND_GENERATOR_FORCED_CLOSE      = 0x2;
 static const zend_uchar ZEND_GENERATOR_AT_FIRST_YIELD    = 0x4;
 static const zend_uchar ZEND_GENERATOR_DO_INIT           = 0x8;
+static const zend_uchar ZEND_GENERATOR_IN_FIBER          = 0x10;
 
 void zend_register_generator_ce(void);
 ZEND_API void zend_generator_close(zend_generator *generator, bool finished_execution);