com php-src: Removed deprecated conditions: ext/opcache/Optimiz er/block_pass.c
| From: | Dmitry Stogov | Date: | Wed, 13 May 2015 07:09:06 +0000 |
| Subject: | com php-src: Removed deprecated conditions: ext/opcache/Optimiz er/block_pass.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86720@lists.php.net to get a copy of this message | ||
Commit: 7e5aa6b2ea3fc0b8fbd4d67012da8f3985179b19
Author: Dmitry Stogov <dmitry@zend.com> Wed, 13 May 2015 10:09:06 +0300
Parents: f69b30eaae19e9636c56971e48603ff1be785725
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7e5aa6b2ea3fc0b8fbd4d67012da8f3985179b19
Log:
Removed deprecated conditions
Changed paths:
M ext/opcache/Optimizer/block_pass.c
Diff:
diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c
index 4071043..a757d55 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;
}