diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-06-24 12:20:41 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-06-24 12:20:41 +0300 |
| commit | a6387c0aa5e5475d9a028697d4aa99bee9445e6d (patch) | |
| tree | a1f2c8c9247094d02a62964a4682a9b84361128a | |
| parent | 700ba3fc1e288ddc8e58c9d7d293669a7712074d (diff) | |
| download | php-git-a6387c0aa5e5475d9a028697d4aa99bee9445e6d.tar.gz | |
Added ability to make non-local control transfer through interrupt function
| -rw-r--r-- | Zend/zend_vm_def.h | 2 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index feded0a937..dcfaf97b10 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -8613,7 +8613,7 @@ ZEND_VM_HELPER(zend_interrupt_helper, ANY, ANY) } else if (zend_interrupt_function) { SAVE_OPLINE(); zend_interrupt_function(execute_data); - LOAD_OPLINE(); + ZEND_VM_ENTER(); } ZEND_VM_CONTINUE(); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 1943dc553a..e68f8e4bed 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -2081,7 +2081,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_interrupt_helper_SPEC(ZEND_OPC } else if (zend_interrupt_function) { SAVE_OPLINE(); zend_interrupt_function(execute_data); - LOAD_OPLINE(); + ZEND_VM_ENTER(); } ZEND_VM_CONTINUE(); } |