diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-02 22:03:21 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-02 22:03:21 +0400 |
| commit | 4b09dd69e6bd31f4010bf48e9e07e63cb5f3c2a4 (patch) | |
| tree | ba61f22f1d9c12700d288bebe62a5cab3b6cb77a /Zend/zend_execute.c | |
| parent | 412ad4b25417d261c0a8c43f788d5c110593d891 (diff) | |
| download | php-git-4b09dd69e6bd31f4010bf48e9e07e63cb5f3c2a4.tar.gz | |
Removed EG(active_op_array) and use corresponding value from EG(current_execute_data)
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 1500640f9b..a40bb4cefd 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -116,7 +116,8 @@ static zend_always_inline void zend_pzval_unlock_func(zval *z, zend_free_op *sho /* End of zend_execute_locks.h */ -#define CV_DEF_OF(i) (EG(active_op_array)->vars[i]) +// TODO: avoid global variable usage ??? +#define CV_DEF_OF(i) (EG(current_execute_data)->func->op_array.vars[i]) #define CTOR_CALL_BIT 0x1 #define CTOR_USED_BIT 0x2 @@ -982,7 +983,7 @@ static void zend_extension_fcall_end_handler(const zend_extension *extension, ze } -static zend_always_inline HashTable *zend_get_target_symbol_table(int fetch_type TSRMLS_DC) +static zend_always_inline HashTable *zend_get_target_symbol_table(zend_execute_data *execute_data, int fetch_type TSRMLS_DC) { HashTable *ht; @@ -990,8 +991,8 @@ static zend_always_inline HashTable *zend_get_target_symbol_table(int fetch_type EXPECTED(fetch_type == ZEND_FETCH_GLOBAL)) { ht = &EG(symbol_table).ht; } else if (EXPECTED(fetch_type == ZEND_FETCH_STATIC)) { - ZEND_ASSERT(EG(active_op_array)->static_variables != NULL); - ht = EG(active_op_array)->static_variables; + ZEND_ASSERT(execute_data->func->op_array.static_variables != NULL); + ht = execute_data->func->op_array.static_variables; } else { ZEND_ASSERT(fetch_type == ZEND_FETCH_LOCAL); if (!EG(active_symbol_table)) { |