com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_v m_def.h Zend/zend_vm_execute.h
| From: | Dmitry Stogov | Date: | Tue, 23 Apr 2013 19:55:47 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_v m_def.h Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71985@lists.php.net to get a copy of this message | ||
Commit: 43ab915b41bbb236ca0aa1966c946c9c36fa2a2b
Author: Dmitry Stogov <dmitry@zend.com> Tue, 23 Apr 2013 23:55:47 +0400
Parents: b3aa3c26168df33fd739669bb7ede2af88051158 4cf0647399b7f79fa1d74bba9d528bc74b78ba10
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=43ab915b41bbb236ca0aa1966c946c9c36fa2a2b
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function
is not yet set to the calling function.
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Changed paths:
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
Diff:
diff --cc Zend/zend_vm_def.h
index f051c1a,02566f3..eed65e3
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@@ -3140,7 -2710,9 +3140,9 @@@ ZEND_VM_HANDLER(67, ZEND_SEND_REF, VAR|
ZEND_VM_NEXT_OPCODE();
}
- if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION &&
!ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.opline_num)) {
+ if (opline->extended_value == ZEND_DO_FCALL_BY_NAME &&
+ EX(function_state).function->type == ZEND_INTERNAL_FUNCTION &&
- !ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.u.opline_num)) {
++ !ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.opline_num)) {
ZEND_VM_DISPATCH_TO_HELPER(zend_send_by_var_helper);
}
diff --cc Zend/zend_vm_execute.h
index 07082d4,f6220b0..18b3f47
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -11171,7 -8399,9 +11171,9 @@@ static int ZEND_FASTCALL ZEND_SEND_REF
ZEND_VM_NEXT_OPCODE();
}
- if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION &&
!ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.opline_num)) {
+ if (opline->extended_value == ZEND_DO_FCALL_BY_NAME &&
+ EX(function_state).function->type == ZEND_INTERNAL_FUNCTION &&
- !ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.u.opline_num)) {
++ !ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2..opline_num)) {
return zend_send_by_var_helper_SPEC_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
}
@@@ -27123,7 -22314,9 +27125,9 @@@ static int ZEND_FASTCALL ZEND_SEND_REF
ZEND_VM_NEXT_OPCODE();
}
- if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION &&
!ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.opline_num)) {
+ if (opline->extended_value == ZEND_DO_FCALL_BY_NAME &&
+ EX(function_state).function->type == ZEND_INTERNAL_FUNCTION &&
- !ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.u.opline_num)) {
++ !ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.opline_num)) {
return zend_send_by_var_helper_SPEC_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
}