com php-src: Reverted useless cleanup code: Zend/zend_vm_de f.h Zend/zend_vm_execute.h

Commit: bdada12dae8a30f468a3e8aa029bedecdf2c767b Author: Dmitry Stogov <dmitry@zend.com> Mon, 10 Aug 2015 23:55:37 +0300 Parents: 97f159d70288ae94f9a05a370121bcbea760ed9a Branches: PHP-7.0.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bdada12dae8a30f468a3e8aa029bedecdf2c767b Log: Reverted useless cleanup code Changed paths: M Zend/zend_vm_def.h M Zend/zend_vm_execute.h Diff: diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 6339ec6..c968fd2 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2609,13 +2609,10 @@ ZEND_VM_HANDLER(47, ZEND_JMPNZ_EX, CONST|TMPVAR|CV, ANY) ZEND_VM_HANDLER(70, ZEND_FREE, TMPVAR, ANY) { - zval *var; USE_OPLINE SAVE_OPLINE(); - var = EX_VAR(opline->op1.var); - zval_ptr_dtor_nogc(var); - ZVAL_NULL(var); + zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -2628,10 +2625,8 @@ ZEND_VM_HANDLER(127, ZEND_FE_FREE, TMPVAR, ANY) var = EX_VAR(opline->op1.var); if (Z_TYPE_P(var) != IS_ARRAY && Z_FE_ITER_P(var) != (uint32_t)-1) { zend_hash_iterator_del(Z_FE_ITER_P(var)); - Z_FE_ITER_P(var) = (uint32_t)-1; } zval_ptr_dtor_nogc(var); - ZVAL_NULL(var); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index a0a1c1f..5645ed6 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -40244,13 +40244,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPNZ_EX_SPEC_TMPVAR_HANDLER(Z static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FREE_SPEC_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { - zval *var; USE_OPLINE SAVE_OPLINE(); - var = EX_VAR(opline->op1.var); - zval_ptr_dtor_nogc(var); - ZVAL_NULL(var); + zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -40263,10 +40260,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_FREE_SPEC_TMPVAR_HANDLER(ZE var = EX_VAR(opline->op1..var); if (Z_TYPE_P(var) != IS_ARRAY && Z_FE_ITER_P(var) != (uint32_t)-1) { zend_hash_iterator_del(Z_FE_ITER_P(var)); - Z_FE_ITER_P(var) = (uint32_t)-1; } zval_ptr_dtor_nogc(var); - ZVAL_NULL(var); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); }