Removed EG(valid_symbol_table). Used EG(active) instead.

diff --git a/Zend/zend.c b/Zend/zend.c
index a6677099a55bb6b33c27d66c788e0518120bf940..0cb0cc7d4138ebc49e13221491a9e006ea2814cc 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -638,7 +638,6 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{
        zend_get_windows_version_info(&executor_globals->windows_version_info);
 #endif
        executor_globals->flags = EG_FLAGS_INITIAL;
-       executor_globals->valid_symbol_table = 0;
 }
 /* }}} */
 

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 302a7828ebc53ce057c8a9e6d4060bb62ebb8fdf..5e02b78af18f49946de0aa783ff92b9bf47edf80 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -146,7 +146,6 @@ void init_executor(void) /* {{{ */
        zend_vm_stack_init();
 
        zend_hash_init(&EG(symbol_table), 64, NULL, ZVAL_PTR_DTOR, 0);
-       EG(valid_symbol_table) = 1;
 
        zend_llist_apply(&zend_extensions, (llist_apply_func_t) zend_extension_activator);
 
@@ -267,7 +266,6 @@ void shutdown_executor(void) /* {{{ */
        /* All resources and objects are destroyed. */
        /* No PHP callback functions may be called after this point. */
        EG(active) = 0;
-       EG(valid_symbol_table) = 0;
 
        zend_try {
                zend_llist_apply(&zend_extensions, (llist_apply_func_t) zend_extension_deactivator);

diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index 151f47c71fa8a1a9080759debf2aac9241727b14..c026b30d340e7bedd6ae3c2d9c24aedfd5198698 100644 (file)
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -208,7 +208,6 @@ struct _zend_executor_globals {
        struct _zend_module_entry *current_module;
 
        zend_bool active;
-       zend_bool valid_symbol_table;
        zend_uchar flags;
 
        zend_long assertions;

diff --git a/main/main.c b/main/main.c
index d6dee64e6717e856b09234944bd60b528a2c6ba2..90dc78d8b416bc3295d0d606e8f38f35c27fc2b4 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -908,7 +908,7 @@ PHPAPI ZEND_COLD void php_verror(const char *docref, const char *params, int typ
                efree(docref_buf);
        }
 
-       if (PG(track_errors) && module_initialized && EG(valid_symbol_table) &&
+       if (PG(track_errors) && module_initialized && EG(active) &&
                        (Z_TYPE(EG(user_error_handler)) == IS_UNDEF || !(EG(user_error_handler_error_reporting) & type))) {
                zval tmp;
                ZVAL_STRINGL(&tmp, buffer, buffer_len);
@@ -1235,7 +1235,7 @@ static ZEND_COLD void php_error_cb(int type, const char *error_filename, const u
                return;
        }
 
-       if (PG(track_errors) && module_initialized && EG(valid_symbol_table)) {
+       if (PG(track_errors) && module_initialized && EG(active)) {
                zval tmp;
 
                ZVAL_STRINGL(&tmp, buffer, buffer_len);