diff options
| author | Nikita Popov <nikic@php.net> | 2012-08-25 20:07:01 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-08-26 13:03:55 +0200 |
| commit | d60e3c6ef53986e82178bb657ad907edc16d2c34 (patch) | |
| tree | 473211d0b04ac4eec07e2730277d31501b432a6d /Zend/zend_vm_execute.skl | |
| parent | bd70d155885fdc087afba912c1b290615b864e2f (diff) | |
| parent | 35951d4be0bd27c85519995a95429bd0d0a76a00 (diff) | |
| download | php-git-d60e3c6ef53986e82178bb657ad907edc16d2c34.tar.gz | |
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
Conflicts:
Zend/zend_language_parser.y
Zend/zend_vm_execute.skl
Diffstat (limited to 'Zend/zend_vm_execute.skl')
| -rw-r--r-- | Zend/zend_vm_execute.skl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_vm_execute.skl b/Zend/zend_vm_execute.skl index 25b3d71534..58e5631c95 100644 --- a/Zend/zend_vm_execute.skl +++ b/Zend/zend_vm_execute.skl @@ -76,8 +76,7 @@ zend_execute_data *zend_create_execute_data_from_op_array(zend_op_array *op_arra ZEND_API void {%EXECUTOR_NAME%}_ex(zend_execute_data *execute_data TSRMLS_DC) { DCL_OPLINE - - zend_bool original_in_execution = EG(in_execution); + zend_bool original_in_execution; {%HELPER_VARS%} @@ -87,6 +86,7 @@ ZEND_API void {%EXECUTOR_NAME%}_ex(zend_execute_data *execute_data TSRMLS_DC) return; } + original_in_execution = EG(in_execution); EG(in_execution) = 1; LOAD_REGS(); |