Switch to compiler globals

Author: danog

Zend/zend_extensions.c

@@ -19,7 +19,6 @@
 
 #include "zend_extensions.h"
 #include "zend_system_id.h"
-#include "SAPI.h"
 
 ZEND_API zend_llist zend_extensions;
 ZEND_API uint32_t zend_extension_flags = 0;

Zend/zend_globals.h

@@ -161,6 +161,8 @@ struct _zend_compiler_globals {
 #ifdef ZTS
 	uint32_t copied_functions_count;
 #endif
+
+	bool isolate_symbols;
 };
 
 

Zend/zend_portability.h

@@ -166,7 +166,7 @@
 #  define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
 # elif defined(RTLD_DEEPBIND) && !defined(__SANITIZE_ADDRESS__) && !__has_feature(memory_sanitizer)
 #  if defined(LM_ID_NEWLM)
-#    define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | ((sapi_module.flags & SAPI_MODULE_FLAG_ISOLATE_SYMBOLS) != 0 ? RTLD_DEEPBIND : 0))
+#    define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | (CG(isolate_symbols) ? RTLD_DEEPBIND : 0))
 #  else
 #    define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | RTLD_DEEPBIND)
 #  endif

main/SAPI.c

@@ -69,6 +69,7 @@ SAPI_API void sapi_startup(sapi_module_struct *sf)
 {
 	sf->ini_entries = NULL;
 	sapi_module = *sf;
+	CG(isolate_symbols) = (sf->flags & SAPI_MODULE_FLAG_ISOLATE_SYMBOLS) != 0;
 
 #ifdef ZTS
 	ts_allocate_fast_id(&sapi_globals_id, &sapi_globals_offset, sizeof(sapi_globals_struct), (ts_allocate_ctor) sapi_globals_ctor, (ts_allocate_dtor) sapi_globals_dtor);

sapi/litespeed/lsapilib.c

@@ -93,7 +93,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #include <Zend/zend_portability.h>
-#include "main/SAPI.h"
 
 struct lsapi_MD5Context {
     uint32 buf[4];

sapi/phpdbg/phpdbg_prompt.c

@@ -19,7 +19,6 @@
 #include <stdio.h>
 #include <string.h>
 #include "zend.h"
-#include "main/SAPI.h"
 #include "zend_compile.h"
 #include "zend_exceptions.h"
 #include "zend_vm.h"