diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-11-27 09:56:43 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-11-27 09:56:43 +0300 |
| commit | 216ef321730f40e87397f38138504a91e09ae287 (patch) | |
| tree | 263fc44cace90b09b3a32ca7d9f6e2a08931856f /Zend/zend_execute.c | |
| parent | c0a4561fb434237699bbbdc733987e2954811e59 (diff) | |
| download | php-git-216ef321730f40e87397f38138504a91e09ae287.tar.gz | |
Changed "finally" handling. Removed EX(fast_ret) and EX(delayed_exception). Allocate and use additional IS_TMP_VAR slot on VM stack instead.
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index fc8cd57ced..94197857f4 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1485,7 +1485,6 @@ static zend_always_inline void i_init_func_execute_data(zend_execute_data *execu EX(opline) = op_array->opcodes; EX(call) = NULL; EX(return_value) = return_value; - EX(delayed_exception) = NULL; /* Handle arguments */ first_extra_arg = op_array->num_args; @@ -1551,7 +1550,6 @@ static zend_always_inline void i_init_code_execute_data(zend_execute_data *execu EX(call) = NULL; EX(return_value) = return_value; EX(scope) = EG(scope); - EX(delayed_exception) = NULL; zend_attach_symbol_table(execute_data); @@ -1577,7 +1575,6 @@ static zend_always_inline void i_init_execute_data(zend_execute_data *execute_da EX(call) = NULL; EX(return_value) = return_value; EX(scope) = EG(scope); - EX(delayed_exception) = NULL; if (UNEXPECTED(EX(symbol_table) != NULL)) { zend_attach_symbol_table(execute_data); |