combine conditions

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 8d01d99ee9a5c11267305dbc29dca687870b5f1e..fd995475fb7b5d3dc7270f3c058eb8aa7c42a515 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -4422,7 +4422,7 @@ ZEND_VM_C_LABEL(send_again):
 
                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;
                        int separate = 0;
 

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 592681cd98d077e9239f8e1aff17b10e3ae350d2..c057695586360bbd9ef302ff863e88e3a1e0f3dd 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -954,7 +954,7 @@ send_again:
 
                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;
                        int separate = 0;