Zend async Scheduler ABI

Zend/tests/fibers/error-handling-window-per-fiber.phpt

@@ -0,0 +1,56 @@
+--TEST--
+An EH_THROW error handling window stays with the fiber that opened it
+--FILE--
+<?php
+// SplFileObject::__construct() opens an EH_THROW window (warnings become
+// RuntimeException) and calls the user wrapper inside it.
+class SuspendingWrapper {
+    public $context;
+
+    public function url_stat(string $path, int $flags): array
+    {
+        return ['mode' => 0100644];
+    }
+
+    public function stream_open(string $path, string $mode, int $options, ?string &$opened_path): bool
+    {
+        $started = new Fiber(function () {
+            trigger_error("in a fiber started inside the window", E_USER_WARNING);
+        });
+        $started->start();
+
+        Fiber::suspend();
+
+        try {
+            trigger_error("inside the window after resume", E_USER_WARNING);
+        } catch (RuntimeException $exception) {
+            echo "caught: ", $exception->getMessage(), "\n";
+        }
+
+        return false;
+    }
+}
+
+stream_wrapper_register('suspending', SuspendingWrapper::class);
+
+$fiber = new Fiber(function () {
+    try {
+        new SplFileObject('suspending://file');
+    } catch (RuntimeException $exception) {
+        echo "constructor: ", get_class($exception), "\n";
+    }
+});
+
+$fiber->start();
+trigger_error("in main while the fiber is inside the window", E_USER_WARNING);
+$fiber->resume();
+trigger_error("in main after the window closed", E_USER_WARNING);
+?>
+--EXPECTF--
+Warning: in a fiber started inside the window in %s on line %d
+
+Warning: in main while the fiber is inside the window in %s on line %d
+caught: inside the window after resume
+constructor: RuntimeException
+
+Warning: in main after the window closed in %s on line %d

Zend/tests/fibers/fiber-callable-object-outlives-caller.phpt

@@ -0,0 +1,33 @@
+--TEST--
+Fiber keeps the object a class-string callable resolved to: $this of the creating method outlives it
+--FILE--
+<?php
+class Target {
+    public string $label = "kept";
+
+    public function method(): void {
+        echo "method: {$this->label}\n";
+    }
+
+    public function makeFiber(): Fiber {
+        return new Fiber([Target::class, 'method']);
+    }
+
+    public function __destruct() {
+        echo "released\n";
+    }
+}
+
+// The only reference to the Target is the creating call's $this.
+$fiber = (new Target)->makeFiber();
+$filler = array_fill(0, 100, new stdClass());
+$fiber->start();
+echo "started\n";
+unset($fiber);
+echo "done\n";
+?>
+--EXPECT--
+method: kept
+released
+started
+done

Zend/tests/fibers/gc-generator-in-suspended-fiber.phpt

@@ -0,0 +1,42 @@
+--TEST--
+GC collects a cycle through a generator parked in Fiber::suspend() on a fiber stack
+--FILE--
+<?php
+
+class C {
+    public function __destruct() {
+        echo __METHOD__, "\n";
+    }
+}
+
+function gen() {
+    $c = new C();
+    $self = Fiber::getCurrent(); // cycle: fiber -> frames -> $self -> fiber
+    yield 1;
+    Fiber::suspend("from gen");
+    yield 2;
+}
+
+$fiber = new Fiber(function () {
+    $g = gen();
+    $g->current();
+    $g->next(); // parks in Fiber::suspend() inside the generator
+    echo "unreachable\n";
+});
+
+$fiber->start();
+print "1\n";
+
+// Still referenced: nothing to collect.
+gc_collect_cycles();
+print "2\n";
+
+$fiber = null;
+gc_collect_cycles();
+print "3\n";
+?>
+--EXPECT--
+1
+2
+C::__destruct
+3

Zend/zend.c

@@ -24,6 +24,7 @@
 #include "zend_API.h"
 #include "zend_exceptions.h"
 #include "zend_builtin_functions.h"
+#include "zend_async_API.h"
 #include "zend_ini.h"
 #include "zend_vm.h"
 #include "zend_dtrace.h"
@@ -834,6 +835,7 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{
 	executor_globals->current_fiber_context = NULL;
 	executor_globals->main_fiber_context = NULL;
 	executor_globals->active_fiber = NULL;
+	memset(&executor_globals->shutdown_context, 0, sizeof(executor_globals->shutdown_context));
 #ifdef ZEND_WIN32
 	zend_get_windows_version_info(&executor_globals->windows_version_info);
 #endif
@@ -1982,8 +1984,13 @@ ZEND_API zend_result zend_execute_script(int type, zval *retval, zend_file_handl
 			if (Z_TYPE(EG(user_exception_handler)) != IS_UNDEF) {
 				zend_user_exception_handler();
 			}
+
 			if (EG(exception)) {
-				ret = zend_exception_error(EG(exception), E_ERROR);
+				if (ZEND_ASYNC_CURRENT_COROUTINE == NULL) {
+					ret = zend_exception_error(EG(exception), E_ERROR);
+				} else {
+					ret = FAILURE;
+				}
 			}
 		}
 		zend_destroy_static_vars(op_array);