mirror of
https://github.com/php/php-src.git
synced 2024-09-29 05:46:06 +00:00
Merge branch 'PHP-7.0'
* PHP-7.0: combine conditions
This commit is contained in:
commit
b5d01ab5a1
@ -4388,7 +4388,7 @@ ZEND_VM_C_LABEL(send_again):
|
|||||||
|
|
||||||
zend_vm_stack_extend_call_frame(&EX(call), arg_num - 1, zend_hash_num_elements(ht));
|
zend_vm_stack_extend_call_frame(&EX(call), arg_num - 1, zend_hash_num_elements(ht));
|
||||||
|
|
||||||
if (OP1_TYPE != IS_CONST && OP1_TYPE != IS_TMP_VAR && Z_REFCOUNT_P(args) > 1) {
|
if ((OP1_TYPE & (IS_VAR|IS_CV)) && Z_REFCOUNT_P(args) > 1) {
|
||||||
uint32_t i;
|
uint32_t i;
|
||||||
int separate = 0;
|
int separate = 0;
|
||||||
|
|
||||||
|
@ -1262,7 +1262,7 @@ send_again:
|
|||||||
|
|
||||||
zend_vm_stack_extend_call_frame(&EX(call), arg_num - 1, zend_hash_num_elements(ht));
|
zend_vm_stack_extend_call_frame(&EX(call), arg_num - 1, zend_hash_num_elements(ht));
|
||||||
|
|
||||||
if (opline->op1_type != IS_CONST && opline->op1_type != IS_TMP_VAR && Z_REFCOUNT_P(args) > 1) {
|
if ((opline->op1_type & (IS_VAR|IS_CV)) && Z_REFCOUNT_P(args) > 1) {
|
||||||
uint32_t i;
|
uint32_t i;
|
||||||
int separate = 0;
|
int separate = 0;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user