diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-12 14:29:51 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-12 14:29:51 +0400 |
| commit | 4e66abad54b25ca367fcb6da78524e3c4024e2a0 (patch) | |
| tree | 77632bac13854d5ffcfb9ce2f92ea0ce461db44e /Zend/zend_execute.c | |
| parent | e2ea9a7319c2d7f84d174cf76524c9b92c1541d1 (diff) | |
| download | php-git-4e66abad54b25ca367fcb6da78524e3c4024e2a0.tar.gz | |
Use better data structures (incomplete) - refactored return_value handling
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 33af58d242..14f060d0c7 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1379,7 +1379,7 @@ void zend_free_compiled_variables(zend_execute_data *execute_data TSRMLS_DC) /* * +----------------------------------------+ */ -static zend_always_inline zend_execute_data *i_create_execute_data_from_op_array(zend_op_array *op_array, zend_bool nested TSRMLS_DC) /* {{{ */ +static zend_always_inline zend_execute_data *i_create_execute_data_from_op_array(zend_op_array *op_array, zval *return_value, zend_bool nested TSRMLS_DC) /* {{{ */ { zend_execute_data *execute_data; @@ -1462,6 +1462,7 @@ static zend_always_inline zend_execute_data *i_create_execute_data_from_op_array EG(current_execute_data) = execute_data; EX(nested) = nested; EX(delayed_exception) = NULL; + EX(return_value) = return_value; if (!op_array->run_time_cache && op_array->last_cache_slot) { op_array->run_time_cache = ecalloc(op_array->last_cache_slot, sizeof(void*)); @@ -1489,9 +1490,9 @@ static zend_always_inline zend_execute_data *i_create_execute_data_from_op_array } /* }}} */ -ZEND_API zend_execute_data *zend_create_execute_data_from_op_array(zend_op_array *op_array, zend_bool nested TSRMLS_DC) /* {{{ */ +ZEND_API zend_execute_data *zend_create_execute_data_from_op_array(zend_op_array *op_array, zval *return_value, zend_bool nested TSRMLS_DC) /* {{{ */ { - return i_create_execute_data_from_op_array(op_array, nested TSRMLS_CC); + return i_create_execute_data_from_op_array(op_array, return_value, nested TSRMLS_CC); } /* }}} */ |