From: Dmitry Stogov <dmitry@php.net>
Date: Fri, 22 Oct 2010 09:56:39 +0000 (+0000)
Subject: Removed redundant check
X-Git-Tag: php-5.4.0alpha1~191^2~779
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=635f3aff75631db1c957d3df0ddab598b468d667;p=php

Removed redundant check
---

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index a5d9fec6d5..6bab49c3c7 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -4831,9 +4831,7 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)
 		if (EG(active_op_array)->try_catch_array[i].try_op > op_num) {
 			/* further blocks will not be relevant... */
 			break;
-		}
-		if (op_num >= EG(active_op_array)->try_catch_array[i].try_op
-			&& op_num < EG(active_op_array)->try_catch_array[i].catch_op) {
+		} else if (op_num < EG(active_op_array)->try_catch_array[i].catch_op) {
 			catch_op_num = EX(op_array)->try_catch_array[i].catch_op;
 			catched = 1;
 		}
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 40b246fbab..b8e8edf3d7 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1043,9 +1043,7 @@ static int ZEND_FASTCALL  ZEND_HANDLE_EXCEPTION_SPEC_HANDLER(ZEND_OPCODE_HANDLER
 		if (EG(active_op_array)->try_catch_array[i].try_op > op_num) {
 			/* further blocks will not be relevant... */
 			break;
-		}
-		if (op_num >= EG(active_op_array)->try_catch_array[i].try_op
-			&& op_num < EG(active_op_array)->try_catch_array[i].catch_op) {
+		} else if (op_num < EG(active_op_array)->try_catch_array[i].catch_op) {
 			catch_op_num = EX(op_array)->try_catch_array[i].catch_op;
 			catched = 1;
 		}