diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-09 17:07:41 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-09 17:07:41 +0400 |
| commit | 19729aa7fe0262b1bae2f96e48330f5404a5dcaf (patch) | |
| tree | 1245b186f9f1ecf0dc9fe2a56196847c8092ea06 /Zend/zend_execute.c | |
| parent | 9d6e45a0ee84030f125ec6d49da07796977a2a29 (diff) | |
| download | php-git-19729aa7fe0262b1bae2f96e48330f5404a5dcaf.tar.gz | |
Use data stored in current call frame instead of EG() if possible
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 4b3577bede..9ca6d9c9c7 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1583,9 +1583,9 @@ static zend_always_inline void i_init_func_execute_data(zend_execute_data *execu } } while (0); - if (op_array->this_var != -1 && Z_OBJ(EG(This))) { - ZVAL_OBJ(EX_VAR(op_array->this_var), Z_OBJ(EG(This))); - Z_ADDREF(EG(This)); + if (op_array->this_var != -1 && EX(object)) { + ZVAL_OBJ(EX_VAR(op_array->this_var), EX(object)); + GC_REFCOUNT(EX(object))++; } if (!op_array->run_time_cache && op_array->last_cache_slot) { @@ -1674,9 +1674,9 @@ static zend_always_inline void i_init_execute_data(zend_execute_data *execute_da } } while (0); - if (op_array->this_var != -1 && Z_OBJ(EG(This))) { - ZVAL_OBJ(EX_VAR(op_array->this_var), Z_OBJ(EG(This))); - Z_ADDREF(EG(This)); + if (op_array->this_var != -1 && EX(object)) { + ZVAL_OBJ(EX_VAR(op_array->this_var), EX(object)); + GC_REFCOUNT(EX(object))++; } } |