archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Ready for PR

Browse source
This commit is contained in:
Xinchen Hui 2015-04-09 19:07:59 +08:00
parent 74f9930846
commit 97756d9190
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Zend/zend_vm_def.h
View file

@ -7598,6 +7598,7 @@ ZEND_VM_HANDLER(158, ZEND_PROXY_CALL, ANY, ANY)
zend_free_proxy_call_func(fbc); zend_free_proxy_call_func(fbc);
/* the previously call to current execute_data already check zend_execute_ex */
ZEND_VM_ENTER(); ZEND_VM_ENTER();
} else { } else {
zval retval; zval retval;
@ -7614,7 +7615,12 @@ ZEND_VM_HANDLER(158, ZEND_PROXY_CALL, ANY, ANY)
EG(current_execute_data) = call; EG(current_execute_data) = call;
call->func->internal_function.handler(call, ret); if (!zend_execute_internal) {
/* saves one function call if zend_execute_internal is not used */
fbc->internal_function.handler(call, ret);
} else {
zend_execute_internal(call, ret);
}
execute_data = EG(current_execute_data) = call->prev_execute_data; execute_data = EG(current_execute_data) = call->prev_execute_data;

8
Zend/zend_vm_execute.h
View file

@ -1812,6 +1812,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_PROXY_CALL_SPEC_HANDLER(ZEND_O
zend_free_proxy_call_func(fbc); zend_free_proxy_call_func(fbc);
/* the previously call to current execute_data already check zend_execute_ex */
ZEND_VM_ENTER(); ZEND_VM_ENTER();
} else { } else {
zval retval; zval retval;
@ -1828,7 +1829,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_PROXY_CALL_SPEC_HANDLER(ZEND_O
EG(current_execute_data) = call; EG(current_execute_data) = call;
call->func->internal_function.handler(call, ret); if (!zend_execute_internal) {
/* saves one function call if zend_execute_internal is not used */
fbc->internal_function.handler(call, ret);
} else {
zend_execute_internal(call, ret);
}
execute_data = EG(current_execute_data) = call->prev_execute_data; execute_data = EG(current_execute_data) = call->prev_execute_data;