com php-src: Fix CALL_TRAMPOLINE without global regs: Zend/zend_vm_def.h Zend/zend_vm_execute.h
| From: | Nikita Popov | Date: | Sat, 18 Apr 2015 13:44:04 +0000 |
| Subject: | com php-src: Fix CALL_TRAMPOLINE without global regs: Zend/zend_vm_def.h Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86368@lists.php.net to get a copy of this message | ||
Commit: 9f0f93b00f552b83bf75f52268dd05b767eb7f10
Author: Nikita Popov <nikic@php.net> Sat, 18 Apr 2015 15:43:14 +0200
Parents: 1f0a6241b496220d6039aac425396fd177ad4be6
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9f0f93b00f552b83bf75f52268dd05b767eb7f10
Log:
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.
Changed paths:
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index fa1a187..811de53 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 f991caf..7775c83 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);