From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 8 Apr 2016 13:12:32 +0000 (+0300)
Subject: removed useless ckeck (ZEND_HANDLE_EXCEPTION never uses RETURN_VALUE)
X-Git-Tag: php-7.1.0alpha1~338
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=513b9929a1bcc93e09d6a1fe98823f7ee8951251;p=php

removed useless ckeck (ZEND_HANDLE_EXCEPTION never uses RETURN_VALUE)
---

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 82e0bee0a7..7a6974de09 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -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();
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index c805ae66c2..0b3bafecf0 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -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();