% remove PHP_ASYNC_API ifdef

EdmondDantes · EdmondDantes · commit 48f9e03fea0b · 2025-07-17T22:51:19.000+03:00
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
@@ -75,9 +75,7 @@ static int zend_implement_throwable(zend_class_entry *interface, zend_class_entr
 	}
 	if (zend_string_equals_literal(root->name, "Exception")
 			|| zend_string_equals_literal(root->name, "Error")
-#ifdef PHP_ASYNC_API
 			|| zend_string_equals_literal(root->name, "CancellationException")
-#endif
 			) {
 		return SUCCESS;
 	}
@@ -835,10 +833,8 @@ void zend_register_default_exception(void) /* {{{ */
 	zend_ce_error = register_class_Error(zend_ce_throwable);
 	zend_init_exception_class_entry(zend_ce_error);
 
-#ifdef PHP_ASYNC_API
 	zend_ce_cancellation_exception = register_class_CancellationException(zend_ce_throwable);
 	zend_init_exception_class_entry(zend_ce_cancellation_exception);
-#endif
 
 	zend_ce_compile_error = register_class_CompileError(zend_ce_error);
 	zend_init_exception_class_entry(zend_ce_compile_error);
diff --git a/Zend/zend_exceptions.h b/Zend/zend_exceptions.h
@@ -30,9 +30,7 @@ extern ZEND_API zend_class_entry *zend_ce_throwable;
 extern ZEND_API zend_class_entry *zend_ce_exception;
 extern ZEND_API zend_class_entry *zend_ce_error_exception;
 extern ZEND_API zend_class_entry *zend_ce_error;
-#ifdef PHP_ASYNC_API
 extern ZEND_API zend_class_entry *zend_ce_cancellation_exception;
-#endif
 extern ZEND_API zend_class_entry *zend_ce_compile_error;
 extern ZEND_API zend_class_entry *zend_ce_parse_error;
 extern ZEND_API zend_class_entry *zend_ce_type_error;
diff --git a/Zend/zend_fibers.c b/Zend/zend_fibers.c
@@ -564,7 +564,6 @@ static void zend_fiber_cleanup(zend_fiber_context *context)
 	fiber->caller = NULL;
 }
 
-#ifdef PHP_ASYNC_API
 static zend_always_inline bool can_use_fiber(void)
 {
 	if (UNEXPECTED(ZEND_ASYNC_IS_ACTIVE)) {
@@ -575,7 +574,6 @@ static zend_always_inline bool can_use_fiber(void)
 	ZEND_ASYNC_DEACTIVATE;
 	return true;
 }
-#endif
 
 static ZEND_STACK_ALIGNED void zend_fiber_execute(zend_fiber_transfer *transfer)
 {
@@ -726,11 +724,9 @@ ZEND_API zend_result zend_fiber_start(zend_fiber *fiber, zval *return_value)
 {
 	ZEND_ASSERT(fiber->context.status == ZEND_FIBER_STATUS_INIT);
 
-#ifdef PHP_ASYNC_API
 	if (UNEXPECTED(false == can_use_fiber())) {
 		return FAILURE;
 	}
-#endif
 
 	if (zend_fiber_init_context(&fiber->context, zend_ce_fiber, zend_fiber_execute, EG(fiber_stack_size)) == FAILURE) {
 		return FAILURE;
@@ -747,11 +743,9 @@ ZEND_API zend_result zend_fiber_start(zend_fiber *fiber, zval *return_value)
 
 ZEND_API void zend_fiber_resume(zend_fiber *fiber, zval *value, zval *return_value)
 {
-#ifdef PHP_ASYNC_API
 	if (UNEXPECTED(false == can_use_fiber())) {
 		return;
 	}
-#endif
 
 	ZEND_ASSERT(fiber->context.status == ZEND_FIBER_STATUS_SUSPENDED && fiber->caller == NULL);
 
@@ -764,11 +758,9 @@ ZEND_API void zend_fiber_resume(zend_fiber *fiber, zval *value, zval *return_val
 
 ZEND_API void zend_fiber_resume_exception(zend_fiber *fiber, zval *exception, zval *return_value)
 {
-#ifdef PHP_ASYNC_API
 	if (UNEXPECTED(false == can_use_fiber())) {
 		return;
 	}
-#endif
 
 	ZEND_ASSERT(fiber->context.status == ZEND_FIBER_STATUS_SUSPENDED && fiber->caller == NULL);
 
@@ -781,11 +773,9 @@ ZEND_API void zend_fiber_resume_exception(zend_fiber *fiber, zval *exception, zv
 
 ZEND_API void zend_fiber_suspend(zend_fiber *fiber, zval *value, zval *return_value)
 {
-#ifdef PHP_ASYNC_API
 	if (UNEXPECTED(false == can_use_fiber())) {
 		return;
 	}
-#endif
 
 	fiber->stack_bottom->prev_execute_data = NULL;
 
@@ -915,11 +905,9 @@ ZEND_METHOD(Fiber, __construct)
 		Z_PARAM_FUNC(fci, fcc)
 	ZEND_PARSE_PARAMETERS_END();
 
-#ifdef PHP_ASYNC_API
 	if (UNEXPECTED(false == can_use_fiber())) {
 		RETURN_THROWS();
 	}
-#endif
 
 	zend_fiber *fiber = (zend_fiber *) Z_OBJ_P(ZEND_THIS);
 
@@ -943,11 +931,9 @@ ZEND_METHOD(Fiber, start)
 		Z_PARAM_VARIADIC_WITH_NAMED(fiber->fci.params, fiber->fci.param_count, fiber->fci.named_params);
 	ZEND_PARSE_PARAMETERS_END();
 
-#ifdef PHP_ASYNC_API
 	if (UNEXPECTED(false == can_use_fiber())) {
 		RETURN_THROWS();
 	}
-#endif
 
 	if (UNEXPECTED(zend_fiber_switch_blocked())) {
 		zend_throw_error(zend_ce_fiber_error, "Cannot switch fibers in current execution context");
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
@@ -163,14 +163,12 @@ struct _zend_compiler_globals {
 #endif
 };
 
-#ifdef PHP_ASYNC_API
 typedef struct {
 	bool is_started;
 	void *coroutine;
 	uint32_t num_elements;
 	uint32_t idx;
 } zend_shutdown_context_t;
-#endif
 
 struct _zend_executor_globals {
 	zval uninitialized_zval;
@@ -267,10 +265,8 @@ struct _zend_executor_globals {
 	const zend_op *opline_before_exception;
 	zend_op exception_op[3];
 
-#ifdef PHP_ASYNC_API
 	// Used to track the state of shutdown destructors in coroutines
 	zend_shutdown_context_t shutdown_context;
-#endif
 
 	struct _zend_module_entry *current_module;
 
diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c
@@ -65,7 +65,6 @@ ZEND_API void ZEND_FASTCALL zend_objects_store_call_destructors(zend_objects_sto
 	}
 }
 
-#ifdef PHP_ASYNC_API
 static void  store_call_destructors_coroutine_dtor(zend_coroutine_t *coroutine)
 {
 	zend_shutdown_context_t *shutdown_context = &EG(shutdown_context);
@@ -157,7 +156,6 @@ ZEND_API void ZEND_FASTCALL zend_objects_store_call_destructors_async(zend_objec
 
 	shutdown_context->is_started = false;
 }
-#endif
 
 ZEND_API void ZEND_FASTCALL zend_objects_store_mark_destructed(zend_objects_store *objects)
 {
diff --git a/Zend/zend_objects_API.h b/Zend/zend_objects_API.h
@@ -55,9 +55,7 @@ typedef struct _zend_objects_store {
 BEGIN_EXTERN_C()
 ZEND_API void ZEND_FASTCALL zend_objects_store_init(zend_objects_store *objects, uint32_t init_size);
 ZEND_API void ZEND_FASTCALL zend_objects_store_call_destructors(zend_objects_store *objects);
-#ifdef PHP_ASYNC_API
 ZEND_API void ZEND_FASTCALL zend_objects_store_call_destructors_async(zend_objects_store *objects);
-#endif
 ZEND_API void ZEND_FASTCALL zend_objects_store_mark_destructed(zend_objects_store *objects);
 ZEND_API void ZEND_FASTCALL zend_objects_store_free_object_storage(zend_objects_store *objects, bool fast_shutdown);
 ZEND_API void ZEND_FASTCALL zend_objects_store_destroy(zend_objects_store *objects);

Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,6 @@ static void zend_fiber_cleanup(zend_fiber_context *context)`
`564`	`564`	`fiber->caller = NULL;`
`565`	`565`	`}`
`566`	`566`
`567`		`-#ifdef PHP_ASYNC_API`
`568`	`567`	`static zend_always_inline bool can_use_fiber(void)`
`569`	`568`	`{`
`570`	`569`	`if (UNEXPECTED(ZEND_ASYNC_IS_ACTIVE)) {`
`@@ -575,7 +574,6 @@ static zend_always_inline bool can_use_fiber(void)`
`575`	`574`	`ZEND_ASYNC_DEACTIVATE;`
`576`	`575`	`return true;`
`577`	`576`	`}`
`578`		`-#endif`
`579`	`577`
`580`	`578`	`static ZEND_STACK_ALIGNED void zend_fiber_execute(zend_fiber_transfer *transfer)`
`581`	`579`	`{`
`@@ -726,11 +724,9 @@ ZEND_API zend_result zend_fiber_start(zend_fiber fiber, zval return_value)`
`726`	`724`	`{`
`727`	`725`	`ZEND_ASSERT(fiber->context.status == ZEND_FIBER_STATUS_INIT);`
`728`	`726`
`729`		`-#ifdef PHP_ASYNC_API`
`730`	`727`	`if (UNEXPECTED(false == can_use_fiber())) {`
`731`	`728`	`return FAILURE;`
`732`	`729`	`}`
`733`		`-#endif`
`734`	`730`
`735`	`731`	`if (zend_fiber_init_context(&fiber->context, zend_ce_fiber, zend_fiber_execute, EG(fiber_stack_size)) == FAILURE) {`
`736`	`732`	`return FAILURE;`
`@@ -747,11 +743,9 @@ ZEND_API zend_result zend_fiber_start(zend_fiber fiber, zval return_value)`
`747`	`743`
`748`	`744`	`ZEND_API void zend_fiber_resume(zend_fiber fiber, zval value, zval *return_value)`
`749`	`745`	`{`
`750`		`-#ifdef PHP_ASYNC_API`
`751`	`746`	`if (UNEXPECTED(false == can_use_fiber())) {`
`752`	`747`	`return;`
`753`	`748`	`}`
`754`		`-#endif`
`755`	`749`
`756`	`750`	`ZEND_ASSERT(fiber->context.status == ZEND_FIBER_STATUS_SUSPENDED && fiber->caller == NULL);`
`757`	`751`
`@@ -764,11 +758,9 @@ ZEND_API void zend_fiber_resume(zend_fiber fiber, zval value, zval *return_val`
`764`	`758`
`765`	`759`	`ZEND_API void zend_fiber_resume_exception(zend_fiber fiber, zval exception, zval *return_value)`
`766`	`760`	`{`
`767`		`-#ifdef PHP_ASYNC_API`
`768`	`761`	`if (UNEXPECTED(false == can_use_fiber())) {`
`769`	`762`	`return;`
`770`	`763`	`}`
`771`		`-#endif`
`772`	`764`
`773`	`765`	`ZEND_ASSERT(fiber->context.status == ZEND_FIBER_STATUS_SUSPENDED && fiber->caller == NULL);`
`774`	`766`
`@@ -781,11 +773,9 @@ ZEND_API void zend_fiber_resume_exception(zend_fiber fiber, zval exception, zv`
`781`	`773`
`782`	`774`	`ZEND_API void zend_fiber_suspend(zend_fiber fiber, zval value, zval *return_value)`
`783`	`775`	`{`
`784`		`-#ifdef PHP_ASYNC_API`
`785`	`776`	`if (UNEXPECTED(false == can_use_fiber())) {`
`786`	`777`	`return;`
`787`	`778`	`}`
`788`		`-#endif`
`789`	`779`
`790`	`780`	`fiber->stack_bottom->prev_execute_data = NULL;`
`791`	`781`
`@@ -915,11 +905,9 @@ ZEND_METHOD(Fiber, __construct)`
`915`	`905`	`Z_PARAM_FUNC(fci, fcc)`
`916`	`906`	`ZEND_PARSE_PARAMETERS_END();`
`917`	`907`
`918`		`-#ifdef PHP_ASYNC_API`
`919`	`908`	`if (UNEXPECTED(false == can_use_fiber())) {`
`920`	`909`	`RETURN_THROWS();`
`921`	`910`	`}`
`922`		`-#endif`
`923`	`911`
`924`	`912`	`zend_fiber fiber = (zend_fiber ) Z_OBJ_P(ZEND_THIS);`
`925`	`913`
`@@ -943,11 +931,9 @@ ZEND_METHOD(Fiber, start)`
`943`	`931`	`Z_PARAM_VARIADIC_WITH_NAMED(fiber->fci.params, fiber->fci.param_count, fiber->fci.named_params);`
`944`	`932`	`ZEND_PARSE_PARAMETERS_END();`
`945`	`933`
`946`		`-#ifdef PHP_ASYNC_API`
`947`	`934`	`if (UNEXPECTED(false == can_use_fiber())) {`
`948`	`935`	`RETURN_THROWS();`
`949`	`936`	`}`
`950`		`-#endif`
`951`	`937`
`952`	`938`	`if (UNEXPECTED(zend_fiber_switch_blocked())) {`
`953`	`939`	`zend_throw_error(zend_ce_fiber_error, "Cannot switch fibers in current execution context");`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ ZEND_API void ZEND_FASTCALL zend_objects_store_call_destructors(zend_objects_sto`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`68`		`-#ifdef PHP_ASYNC_API`
`69`	`68`	`static void store_call_destructors_coroutine_dtor(zend_coroutine_t *coroutine)`
`70`	`69`	`{`
`71`	`70`	`zend_shutdown_context_t *shutdown_context = &EG(shutdown_context);`
`@@ -157,7 +156,6 @@ ZEND_API void ZEND_FASTCALL zend_objects_store_call_destructors_async(zend_objec`
`157`	`156`
`158`	`157`	`shutdown_context->is_started = false;`
`159`	`158`	`}`
`160`		`-#endif`
`161`	`159`
`162`	`160`	`ZEND_API void ZEND_FASTCALL zend_objects_store_mark_destructed(zend_objects_store *objects)`
`163`	`161`	`{`