com php-src: QA: Simplify code to initialize a NULL value See https://github.com/php/php-src/pull/647#discussion _r14560540: Zend/zend_vm_def.h Ze
nd/zend_vm_execute.h
| From: | Tjerk Anne Meesters | Date: | Sun, 06 Jul 2014 10:38:29 +0000 |
| Subject: | com php-src: QA: Simplify code to initialize a NULL value See https://github.com/php/php-src/pull/647#discussion _r14560540: Zend/zend_vm_def.h Ze nd/zend_vm_execute.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82145@lists.php.net to get a copy of this message | ||
Commit: abd42ea4c2d5e10fd88d6f89c6fcad9bc79d2f1b
Author: Timm Friebe <thekid@thekid.de> Sun, 6 Jul 2014 12:38:29 +0200
Parents: 2758824940e84e591565f22005f4db023cbd4c1d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=abd42ea4c2d5e10fd88d6f89c6fcad9bc79d2f1b
Log:
QA: Simplify code to initialize a NULL value
See https://github.com/php/php-src/pull/647#discussion_r14560540
Changed paths:
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index d16c098..19dbd94 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2482,10 +2482,7 @@ ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV) } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 216f9da..a4492bc 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -9325,10 +9325,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_CONST_HANDLER(ZEND_OPCO } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -10215,10 +10212,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -11106,10 +11100,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -12577,10 +12568,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_ } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -15840,10 +15828,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZEND_OPCO } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -18211,10 +18196,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -20543,10 +20525,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -24025,10 +24004,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_ } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -25692,10 +25668,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CONST_HANDLER(ZEND_O } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -27125,10 +27098,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_TMP_HANDLER(ZEND_OPC } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -28464,10 +28434,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_VAR_HANDLER(ZEND_OPC } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -30231,10 +30198,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCO } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -33495,10 +33459,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CONST_HANDLER(ZEND_OPCOD } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -35632,10 +35593,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_ } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -37824,10 +37782,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_ } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -41017,10 +40972,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_H } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE();
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index d16c098..19dbd94 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2482,10 +2482,7 @@ ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV) } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 216f9da..a4492bc 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -9325,10 +9325,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_CONST_HANDLER(ZEND_OPCO } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -10215,10 +10212,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -11106,10 +11100,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -12577,10 +12568,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_ } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -15840,10 +15828,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZEND_OPCO } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -18211,10 +18196,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -20543,10 +20525,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -24025,10 +24004,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_ } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -25692,10 +25668,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CONST_HANDLER(ZEND_O } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -27125,10 +27098,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_TMP_HANDLER(ZEND_OPC } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -28464,10 +28434,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_VAR_HANDLER(ZEND_OPC } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -30231,10 +30198,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCO } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -33495,10 +33459,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CONST_HANDLER(ZEND_OPCOD } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -35632,10 +35593,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_ } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -37824,10 +37782,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_ } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE(); @@ -41017,10 +40972,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_H } } while (nested); - MAKE_STD_ZVAL(EX_T(opline->result.var).var.ptr); - ZVAL_NULL(EX_T(opline->result.var).var.ptr); - Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); - Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); + ALLOC_INIT_ZVAL(EX_T(opline->result.var).var.ptr); EX_T(opline->result.var).var.fcall_returned_reference = 0; EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; ZEND_VM_NEXT_OPCODE();