archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
Dmitry Stogov 2017-06-26 13:35:07 +03:00
parent 24030d54d8
commit caaeb4849a
4 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Zend/zend.c
View file

@ -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;
}
/* }}} */

2
Zend/zend_execute_API.c
View file

@ -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);

1
Zend/zend_globals.h
View file

@ -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;

4
main/main.c
View file

@ -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);