+ Refactoring async_coroutine_cancel

Author: EdmondDantes

Zend/zend_async_API.c

@@ -711,19 +711,30 @@ ZEND_API zend_async_waker_t * zend_async_waker_new_with_timeout(
 	return waker;
 }
 
-ZEND_API bool zend_async_waker_apply_error(zend_async_waker_t *waker, zend_object *error, bool override, bool for_cancellation)
+ZEND_API bool zend_async_waker_apply_error(
+	zend_async_waker_t *waker, zend_object *error, bool tranfer_error, bool override, bool for_cancellation
+)
 {
 	if (UNEXPECTED(waker == NULL)) {
+		if (tranfer_error) {
+			OBJ_RELEASE(error);
+		}
 		return false;
 	}
 
 	if (EXPECTED(waker->error == NULL)) {
 		waker->error = error;
+		if (false == tranfer_error) {
+			GC_ADDREF(error);
+		}
 		return true;
 	}
 
 	if (for_cancellation && instanceof_function(waker->error->ce, zend_ce_cancellation_exception)) {
 		// If the waker already has a cancellation exception, we do not override it
+		if (tranfer_error) {
+			OBJ_RELEASE(error);
+		}
 		return false;
 	}
 
@@ -734,6 +745,10 @@ ZEND_API bool zend_async_waker_apply_error(zend_async_waker_t *waker, zend_objec
 		zend_exception_set_previous(waker->error, error);
 	}
 
+	if (false == tranfer_error) {
+		GC_ADDREF(error);
+	}
+
 	return true;
 }
 

Zend/zend_async_API.h

@@ -188,7 +188,7 @@ typedef zend_coroutine_t * (*zend_async_spawn_t)(zend_async_scope_t *scope, zend
 typedef void (*zend_async_suspend_t)(bool from_main);
 typedef void (*zend_async_enqueue_coroutine_t)(zend_coroutine_t *coroutine);
 typedef void (*zend_async_resume_t)(zend_coroutine_t *coroutine, zend_object * error, const bool transfer_error);
-typedef void (*zend_async_cancel_t)(zend_coroutine_t *coroutine, zend_object * error, const bool transfer_error, const bool is_safely);
+typedef void (*zend_async_cancel_t)(zend_coroutine_t *coroutine, zend_object * error, bool transfer_error, const bool is_safely);
 typedef void (*zend_async_shutdown_t)(void);
 typedef zend_array* (*zend_async_get_coroutines_t)(void);
 typedef void (*zend_async_add_microtask_t)(zend_async_microtask_t *microtask);
@@ -1124,13 +1124,15 @@ ZEND_API zend_async_waker_t *zend_async_waker_new(zend_coroutine_t *coroutine);
 ZEND_API zend_async_waker_t * zend_async_waker_new_with_timeout(
 	zend_coroutine_t * coroutine, const zend_ulong timeout, zend_async_event_t *cancellation
 );
-ZEND_API bool zend_async_waker_apply_error(zend_async_waker_t *waker, zend_object *error, bool override, bool for_cancellation);
+ZEND_API bool zend_async_waker_apply_error(
+	zend_async_waker_t *waker, zend_object *error, bool transfer_error, bool override, bool for_cancellation
+);
 ZEND_API void zend_async_waker_destroy(zend_coroutine_t *coroutine);
 ZEND_API void zend_async_waker_add_triggered_event(zend_coroutine_t *coroutine, zend_async_event_t *event);
 
-#define ZEND_ASYNC_WAKER_APPLY_ERROR(waker, error) zend_async_waker_apply_error((waker), (error), true, false)
-#define ZEND_ASYNC_WAKER_APPEND_ERROR(waker, error) zend_async_waker_apply_error((waker), (error), false, false)
-#define ZEND_ASYNC_WAKER_APPLY_CANCELLATION(waker, error) zend_async_waker_apply_error((waker), (error), true, true)
+#define ZEND_ASYNC_WAKER_APPLY_ERROR(waker, error, transfer) zend_async_waker_apply_error((waker), (error), (transfer), true, false)
+#define ZEND_ASYNC_WAKER_APPEND_ERROR(waker, error, transfer) zend_async_waker_apply_error((waker), (error), (transfer), false, false)
+#define ZEND_ASYNC_WAKER_APPLY_CANCELLATION(waker, error, transfer) zend_async_waker_apply_error((waker), (error), (transfer), true, true)
 
 ZEND_API void zend_async_resume_when(
 		zend_coroutine_t			*coroutine,