% Code refactoring according to the PR.

Author: EdmondDantes

Zend/zend.c

@@ -41,9 +41,7 @@
 #include "Optimizer/zend_optimizer.h"
 #include "php.h"
 #include "php_globals.h"
-#ifdef PHP_ASYNC_API
 #include "zend_async_API.h"
-#endif
 
 // FIXME: Breaks the declaration of the function below
 #undef zenderror
@@ -1335,11 +1333,7 @@ ZEND_API void zend_activate(void) /* {{{ */
 void zend_call_destructors(void) /* {{{ */
 {
 	zend_try {
-#ifdef PHP_ASYNC_API
-		shutdown_destructors_async();
-#else
 		shutdown_destructors();
-#endif
 	} zend_end_try();
 }
 /* }}} */
@@ -1356,11 +1350,9 @@ ZEND_API void zend_deactivate(void) /* {{{ */
 	/* shutdown_executor() takes care of its own bailout handling */
 	shutdown_executor();
 
-#ifdef PHP_ASYNC_API
 	// The execution of the True Async API should end here,
 	// after the GC has been run.
 	ZEND_ASYNC_ENGINE_SHUTDOWN();
-#endif
 
 	zend_try {
 		zend_ini_deactivate();
@@ -1959,18 +1951,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();
 			}
-#ifdef PHP_ASYNC_API
+
 			// If we are inside a coroutine,
 			// we do not call the final error handler,
 			// as the exception will be handled higher up in the method ZEND_ASYNC_RUN_SCHEDULER_AFTER_MAIN
 			if (false == ZEND_ASYNC_CURRENT_COROUTINE && EG(exception)) {
 				ret = zend_exception_error(EG(exception), E_ERROR);
 			}
-#else
-			if (EG(exception)) {
-				ret = zend_exception_error(EG(exception), E_ERROR);
-			}
-#endif
 		}
 		zend_destroy_static_vars(op_array);
 		destroy_op_array(op_array);

Zend/zend_exceptions.c

@@ -28,9 +28,7 @@
 #include "zend_dtrace.h"
 #include "zend_smart_str.h"
 #include "zend_exceptions_arginfo.h"
-#ifdef PHP_ASYNC_API
 #include "zend_cancellation_exception_arginfo.h"
-#endif
 #include "zend_observer.h"
 
 #define ZEND_EXCEPTION_MESSAGE_OFF 0
@@ -45,9 +43,7 @@ ZEND_API zend_class_entry *zend_ce_throwable;
 ZEND_API zend_class_entry *zend_ce_exception;
 ZEND_API zend_class_entry *zend_ce_error_exception;
 ZEND_API zend_class_entry *zend_ce_error;
-#ifdef PHP_ASYNC_API
 ZEND_API zend_class_entry *zend_ce_cancellation_exception;
-#endif
 ZEND_API zend_class_entry *zend_ce_compile_error;
 ZEND_API zend_class_entry *zend_ce_parse_error;
 ZEND_API zend_class_entry *zend_ce_type_error;
@@ -101,9 +97,6 @@ static int zend_implement_throwable(zend_class_entry *interface, zend_class_entr
 
 static inline zend_class_entry *i_get_exception_base(zend_object *object) /* {{{ */
 {
-#ifndef PHP_ASYNC_API
-	return instanceof_function(object->ce, zend_ce_exception) ? zend_ce_exception : zend_ce_error;
-#else
 	zend_class_entry *instance_ce = object->ce;
 
 	do
@@ -121,7 +114,6 @@ static inline zend_class_entry *i_get_exception_base(zend_object *object) /* {{{
 	} while (instance_ce != NULL);
 
 	return NULL;
-#endif
 }
 /* }}} */
 

Zend/zend_execute.h

@@ -40,9 +40,6 @@ ZEND_API extern zend_class_entry *(*zend_autoload)(zend_string *name, zend_strin
 void init_executor(void);
 void shutdown_executor(void);
 void shutdown_destructors(void);
-#ifdef PHP_ASYNC_API
-void shutdown_destructors_async(void);
-#endif
 ZEND_API void zend_shutdown_executor_values(bool fast_shutdown);
 
 ZEND_API void zend_init_execute_data(zend_execute_data *execute_data, zend_op_array *op_array, zval *return_value);

Zend/zend_execute_API.c

@@ -49,6 +49,8 @@
 #include <sys/syscall.h>
 #endif
 
+#include "zend_async_API.h"
+
 ZEND_API void (*zend_execute_ex)(zend_execute_data *execute_data);
 ZEND_API void (*zend_execute_internal)(zend_execute_data *execute_data, zval *return_value);
 ZEND_API zend_class_entry *(*zend_autoload)(zend_string *name, zend_string *lc_name);
@@ -199,14 +201,12 @@ void init_executor(void) /* {{{ */
 	EG(filename_override) = NULL;
 	EG(lineno_override) = -1;
 
-#ifdef PHP_ASYNC_API
 	EG(shutdown_context) = (zend_shutdown_context_t) {
 		.is_started = false,
 		.coroutine = NULL,
 		.num_elements = 0,
 		.idx = 0
 	};
-#endif
 
 	zend_max_execution_timer_init();
 	zend_fiber_init();
@@ -257,29 +257,7 @@ static ZEND_COLD void zend_throw_or_error(int fetch_type, zend_class_entry *exce
 }
 /* }}} */
 
-void shutdown_destructors(void) /* {{{ */
-{
-	if (CG(unclean_shutdown)) {
-		EG(symbol_table).pDestructor = zend_unclean_zval_ptr_dtor;
-	}
-	zend_try {
-		uint32_t symbols;
-		do {
-			symbols = zend_hash_num_elements(&EG(symbol_table));
-			zend_hash_reverse_apply(&EG(symbol_table), (apply_func_t) zval_call_destructor);
-		} while (symbols != zend_hash_num_elements(&EG(symbol_table)));
-		zend_objects_store_call_destructors(&EG(objects_store));
-	} zend_catch {
-		/* if we couldn't destruct cleanly, mark all objects as destructed anyway */
-		zend_objects_store_mark_destructed(&EG(objects_store));
-	} zend_end_try();
-}
-/* }}} */
-
-#ifdef PHP_ASYNC_API
-#include "zend_async_API.h"
-
-static void  shutdown_destructors_coroutine_dtor(zend_coroutine_t *coroutine)
+static void  shutdown_destructors_coroutine_dtor(zend_coroutine_t *coroutine) /* {{{ */
 {
 	zend_shutdown_context_t *shutdown_context = &EG(shutdown_context);
 
@@ -318,7 +296,7 @@ static bool shutdown_destructors_context_switch_handler(
 	return false;
 }
 
-void shutdown_destructors_async(void) /* {{{ */
+void shutdown_destructors(void) /* {{{ */
 {
 	zend_coroutine_t *coroutine = ZEND_ASYNC_CURRENT_COROUTINE;
 	bool should_continue = false;
@@ -400,7 +378,6 @@ void shutdown_destructors_async(void) /* {{{ */
 	shutdown_context->is_started = false;
 }
 /* }}} */
-#endif
 
 /* Free values held by the executor. */
 ZEND_API void zend_shutdown_executor_values(bool fast_shutdown)

Zend/zend_gc.c

@@ -68,9 +68,7 @@
  */
 #include "zend.h"
 #include "zend_API.h"
-#ifdef PHP_ASYNC_API
 #include "zend_async_API.h"
-#endif
 #include "zend_compile.h"
 #include "zend_errors.h"
 #include "zend_fibers.h"

configure.ac

@@ -1046,16 +1046,6 @@ PHP_ARG_ENABLE([undefined-sanitizer],,
     [Enable undefined sanitizer])],
   [no],
   [no])
-PHP_ARG_ENABLE([async-api],,
-  [AS_HELP_STRING([--disable-async-api],
-    [Disable async API support])],
-  [yes],
-  [no])
-
-AS_VAR_IF([PHP_ASYNC_API], [yes], [
-  AC_DEFINE([PHP_ASYNC_API], [1], [Define to 1 if async API support is enabled.])
-])
-
 
 dnl Extension configuration.
 dnl ----------------------------------------------------------------------------
@@ -1796,10 +1786,8 @@ PHP_ADD_SOURCES([Zend], m4_normalize([
   ]),
   [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 $fiber_asm_cflag])
 
-if test "$PHP_ASYNC_API" = "yes"; then
   PHP_ADD_SOURCES([Zend], m4_normalize([zend_async_API.c]),
     [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 $fiber_asm_cflag])
-fi
 
 PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/scripts/Makefile.frag],
   [$abs_srcdir/scripts],

main/main.c

@@ -2614,10 +2614,9 @@ PHPAPI bool php_execute_script_ex(zend_file_handle *primary_file, zval *retval)
 		if (append_file_p && result) {
 			result = zend_execute_script(ZEND_REQUIRE, NULL, append_file_p) == SUCCESS;
 		}
-		#ifdef PHP_ASYNC_API
-			ZEND_ASYNC_RUN_SCHEDULER_AFTER_MAIN();
-			ZEND_ASYNC_INITIALIZE;
-		#endif
+
+		ZEND_ASYNC_RUN_SCHEDULER_AFTER_MAIN();
+		ZEND_ASYNC_INITIALIZE;
 	} zend_catch {
 		result = false;
 	} zend_end_try();
@@ -2789,10 +2788,8 @@ PHPAPI void php_reserve_tsrm_memory(void)
 		TSRM_ALIGNED_SIZE(zend_mm_globals_size()) +
 		TSRM_ALIGNED_SIZE(zend_gc_globals_size()) +
 		TSRM_ALIGNED_SIZE(sizeof(php_core_globals)) +
-		TSRM_ALIGNED_SIZE(sizeof(sapi_globals_struct))
-#ifdef PHP_ASYNC_API
-		+ TSRM_ALIGNED_SIZE(sizeof(zend_async_globals_t))
-#endif
+		TSRM_ALIGNED_SIZE(sizeof(sapi_globals_struct)) +
+		TSRM_ALIGNED_SIZE(sizeof(zend_async_globals_t))
 	);
 }
 /* }}} */

win32/build/config.w32

@@ -410,7 +410,4 @@ ARG_ENABLE('vs-link-compat', 'Allow linking of libraries built with compatible v
 
 ARG_ENABLE("async-api", "Disable async API support", "yes");
 
-if (PHP_ASYNC_API == "yes") {
-    AC_DEFINE('PHP_ASYNC_API', 1);
-    ADD_SOURCES("Zend", "zend_async_API.c");
-}
+ADD_SOURCES("Zend", "zend_async_API.c");

win32/build/confutils.js

@@ -1997,11 +1997,8 @@ function write_summary()
 	} else {
 		ar[k++] = ['Static analyzer', 'disabled'];
 	}
-    if (typeof PHP_ASYNC_API !== "undefined" && PHP_ASYNC_API == "yes") {
-        ar[k++] = ['True Async API', 'Yes'];
-    } else {
-        ar[k++] = ['True Async API', 'No'];
-    }
+
+    ar[k++] = ['True Async API', 'Yes'];
 
 	output_as_table(["",""], ar);
 	STDOUT.WriteBlankLines(2);