From 7e5aa6b2ea3fc0b8fbd4d67012da8f3985179b19 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Wed, 13 May 2015 10:09:06 +0300 Subject: [PATCH] Removed deprecated conditions --- ext/opcache/Optimizer/block_pass.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c index 4071043186..a757d55fce 100644 --- a/ext/opcache/Optimizer/block_pass.c +++ b/ext/opcache/Optimizer/block_pass.c @@ -1778,11 +1778,8 @@ static void zend_t_usage(zend_code_block *block, zend_op_array *op_array, char * if (RESULT_USED(opline)) { if (!defined_here[VAR_NUM(ZEND_RESULT(opline).var)] && !used_ext[VAR_NUM(ZEND_RESULT(opline).var)] && - (opline->opcode == ZEND_RECV || opline->opcode == ZEND_RECV_INIT || - opline->opcode == ZEND_RECV_VARIADIC || - (opline->opcode == ZEND_OP_DATA && ZEND_RESULT_TYPE(opline) == IS_TMP_VAR) || - opline->opcode == ZEND_ADD_ARRAY_ELEMENT)) { - /* these opcodes use the result as argument */ + opline->opcode == ZEND_ADD_ARRAY_ELEMENT) { + /* these opcode use the result as argument */ used_ext[VAR_NUM(ZEND_RESULT(opline).var)] = 1; } defined_here[VAR_NUM(ZEND_RESULT(opline).var)] = 1; @@ -1856,10 +1853,7 @@ static void zend_t_usage(zend_code_block *block, zend_op_array *op_array, char * } } - if (opline->opcode == ZEND_RECV || - opline->opcode == ZEND_RECV_INIT || - opline->opcode == ZEND_RECV_VARIADIC || - opline->opcode == ZEND_ADD_ARRAY_ELEMENT) { + if (opline->opcode == ZEND_ADD_ARRAY_ELEMENT) { if (ZEND_OP1_TYPE(opline) == IS_VAR || ZEND_OP1_TYPE(opline) == IS_TMP_VAR) { usage[VAR_NUM(ZEND_RESULT(opline).var)] = 1; } -- 2.50.1