Removed redundand code

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 98b315734efab308ac4af4f813a410d012128e1b..0f934255c41d9297ef33a808d9cda9d1617e7ce4 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3496,9 +3496,6 @@ ZEND_VM_HANDLER(118, ZEND_INIT_USER_CALL, CONST, CONST|TMPVAR|CV, NUM)
                object = fcc.object;
                if (func->common.fn_flags & ZEND_ACC_CLOSURE) {
                        /* Delay closure destruction until its invocation */
-                       if (OP2_TYPE & (IS_VAR|IS_CV)) {
-                               ZVAL_DEREF(function_name);
-                       }
                        ZEND_ASSERT(GC_TYPE((zend_object*)func->common.prototype) == IS_OBJECT);
                        GC_REFCOUNT((zend_object*)func->common.prototype)++;
                        call_info |= ZEND_CALL_CLOSURE;

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index f067e06e8099fbf9d5a53ff9a6327c0d863a791f..b6a23b39de7d9a1b6279ded3dbaf61691cb5062b 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -5548,9 +5548,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CONS
                object = fcc.object;
                if (func->common.fn_flags & ZEND_ACC_CLOSURE) {
                        /* Delay closure destruction until its invocation */
-                       if (IS_CONST & (IS_VAR|IS_CV)) {
-                               ZVAL_DEREF(function_name);
-                       }
                        ZEND_ASSERT(GC_TYPE((zend_object*)func->common.prototype) == IS_OBJECT);
                        GC_REFCOUNT((zend_object*)func->common.prototype)++;
                        call_info |= ZEND_CALL_CLOSURE;
@@ -9446,9 +9443,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CV_H
                object = fcc.object;
                if (func->common.fn_flags & ZEND_ACC_CLOSURE) {
                        /* Delay closure destruction until its invocation */
-                       if (IS_CV & (IS_VAR|IS_CV)) {
-                               ZVAL_DEREF(function_name);
-                       }
                        ZEND_ASSERT(GC_TYPE((zend_object*)func->common.prototype) == IS_OBJECT);
                        GC_REFCOUNT((zend_object*)func->common.prototype)++;
                        call_info |= ZEND_CALL_CLOSURE;
@@ -11405,9 +11399,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_TMPV
                object = fcc.object;
                if (func->common.fn_flags & ZEND_ACC_CLOSURE) {
                        /* Delay closure destruction until its invocation */
-                       if ((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_CV)) {
-                               ZVAL_DEREF(function_name);
-                       }
                        ZEND_ASSERT(GC_TYPE((zend_object*)func->common.prototype) == IS_OBJECT);
                        GC_REFCOUNT((zend_object*)func->common.prototype)++;
                        call_info |= ZEND_CALL_CLOSURE;