diff options
Diffstat (limited to 'Zend/zend_globals.h')
| -rw-r--r-- | Zend/zend_globals.h | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index 486336414f..1d427fe478 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | Zend Engine | +----------------------------------------------------------------------+ - | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) | + | Copyright (c) Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ | This source file is subject to version 2.00 of the Zend license, | | that is bundled with this package in the file LICENSE, and is | @@ -45,6 +45,8 @@ BEGIN_EXTERN_C() ZEND_API extern int compiler_globals_id; ZEND_API extern int executor_globals_id; +ZEND_API extern size_t compiler_globals_offset; +ZEND_API extern size_t executor_globals_offset; END_EXTERN_C() #endif @@ -57,10 +59,6 @@ END_EXTERN_C() /* excpt.h on Digital Unix 4.0 defines function_table */ #undef function_table -#define ZEND_EARLY_BINDING_COMPILE_TIME 0 -#define ZEND_EARLY_BINDING_DELAYED 1 -#define ZEND_EARLY_BINDING_DELAYED_ALL 2 - typedef struct _zend_vm_stack *zend_vm_stack; typedef struct _zend_ini_entry zend_ini_entry; @@ -120,11 +118,15 @@ struct _zend_compiler_globals { zend_arena *ast_arena; zend_stack delayed_oplines_stack; + HashTable *memoized_exprs; + int memoize_mode; -#ifdef ZTS - zval **static_members_table; - int last_static_member; -#endif + void *map_ptr_base; + size_t map_ptr_size; + size_t map_ptr_last; + + HashTable *delayed_variance_obligations; + HashTable *delayed_autoloads; }; @@ -134,7 +136,9 @@ struct _zend_executor_globals { /* symbol table cache */ zend_array *symtable_cache[SYMTABLE_CACHE_SIZE]; + /* Pointer to one past the end of the symtable_cache */ zend_array **symtable_cache_limit; + /* Pointer to first unused symtable_cache slot */ zend_array **symtable_cache_ptr; zend_array symbol_table; /* main symbol table */ @@ -230,6 +234,10 @@ struct _zend_executor_globals { zend_bool each_deprecation_thrown; + HashTable weakrefs; + + zend_bool exception_ignore_args; + void *reserved[ZEND_MAX_RESERVED_RESOURCES]; }; @@ -302,13 +310,3 @@ struct _zend_php_scanner_globals { }; #endif /* ZEND_GLOBALS_H */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * indent-tabs-mode: t - * End: - * vim600: sw=4 ts=4 fdm=marker - * vim<600: sw=4 ts=4 - */ |