Move optimizer into core

This only moves the files, adjusts the build system, exports APIs
and does minor fixups to make sure the code builds.

This does not yet try to make the optimizer usable independently
of opcache.

Closes GH-6642.

1 files changed, 5 insertions, 0 deletions

diff --git a/Zend/zend.c b/Zend/zend.c
index 22cdc744e6..4da7991db6 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -34,6 +34,7 @@
 #include "zend_cpuinfo.h"
 #include "zend_attributes.h"
 #include "zend_observer.h"
+#include "Optimizer/zend_optimizer.h"
 
 static size_t global_map_ptr_last = 0;
 
@@ -953,6 +954,8 @@ void zend_startup(zend_utility_functions *utility_functions) /* {{{ */
 	php_win32_cp_setup();
 #endif
 
+	zend_optimizer_startup();
+
 #ifdef ZTS
 	tsrm_set_new_thread_end_handler(zend_new_thread_end_handler);
 	tsrm_set_shutdown_handler(zend_interned_strings_dtor);
@@ -1112,6 +1115,8 @@ void zend_shutdown(void) /* {{{ */
 	}
 #endif
 	zend_destroy_rsrc_list_dtors();
+
+	zend_optimizer_shutdown();
 }
 /* }}} */