]> granicus.if.org Git - php/commitdiff
removed useless ckeck (ZEND_HANDLE_EXCEPTION never uses RETURN_VALUE)
authorDmitry Stogov <dmitry@zend.com>
Fri, 8 Apr 2016 13:12:32 +0000 (16:12 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 8 Apr 2016 13:12:32 +0000 (16:12 +0300)
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

index 82e0bee0a74f3971c85fab75c813741b254162fd..7a6974de09b8e0b36bf65d0b1e9e855a47b79c53 100644 (file)
@@ -2546,7 +2546,7 @@ ZEND_VM_HELPER(zend_leave_helper, ANY, ANY)
                if (UNEXPECTED(EG(exception) != NULL)) {
                        const zend_op *old_opline = EX(opline);
                        zend_throw_exception_internal(NULL);
-                       if (old_opline->opcode != ZEND_HANDLE_EXCEPTION && RETURN_VALUE_USED(old_opline)) {
+                       if (RETURN_VALUE_USED(old_opline)) {
                                zval_ptr_dtor(EX_VAR(old_opline->result.var));
                        }
                        HANDLE_EXCEPTION_LEAVE();
index c805ae66c2aa6bf1627fbf0dd5769ec44ed5fdc8..0b3bafecf00bb80780936229c1e6fc21c9b800d8 100644 (file)
@@ -507,7 +507,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_leave_helper_SPEC(ZEND_OPCODE_
                if (UNEXPECTED(EG(exception) != NULL)) {
                        const zend_op *old_opline = EX(opline);
                        zend_throw_exception_internal(NULL);
-                       if (old_opline->opcode != ZEND_HANDLE_EXCEPTION && RETURN_VALUE_USED(old_opline)) {
+                       if (RETURN_VALUE_USED(old_opline)) {
                                zval_ptr_dtor(EX_VAR(old_opline->result.var));
                        }
                        HANDLE_EXCEPTION_LEAVE();