diff options
| author | Nikita Popov <nikic@php.net> | 2015-04-18 15:43:14 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-04-18 15:44:04 +0200 |
| commit | 9f0f93b00f552b83bf75f52268dd05b767eb7f10 (patch) | |
| tree | 9acead256f64671b2f69f24d5e981488f67dc85f | |
| parent | 1f0a6241b496220d6039aac425396fd177ad4be6 (diff) | |
| download | php-git-9f0f93b00f552b83bf75f52268dd05b767eb7f10.tar.gz | |
Fix CALL_TRAMPOLINE without global regs
The opline needs to be loaded here in any case. However
LOAD_OPLINE() is a no-op if global VM registers are not used.
| -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 fa1a187f14..811de533c5 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -7857,7 +7857,7 @@ ZEND_VM_C_LABEL(call_trampoline_end): ZEND_VM_RETURN(); } - LOAD_OPLINE(); + opline = execute_data->opline; if (object) { OBJ_RELEASE(object); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index f991caf834..7775c83894 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1893,7 +1893,7 @@ call_trampoline_end: ZEND_VM_RETURN(); } - LOAD_OPLINE(); + opline = execute_data->opline; if (object) { OBJ_RELEASE(object); |