]> granicus.if.org Git - php/commitdiff
Removed deprecated conditions
authorDmitry Stogov <dmitry@zend.com>
Wed, 13 May 2015 07:09:06 +0000 (10:09 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 13 May 2015 07:09:06 +0000 (10:09 +0300)
ext/opcache/Optimizer/block_pass.c

index 40710431864b0427148874d0747f4ae2cd774ccb..a757d55fced7f1d769776631eb8a3df72084ade3 100644 (file)
@@ -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;
                                }