diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-07-06 16:52:38 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-07-06 16:52:38 +0300 |
| commit | 436b01e3797860add57a524b4492f8451b60ac68 (patch) | |
| tree | ec6b1d0de9d09269d53b5d4f8fb8570b2c951880 | |
| parent | 1a9f4f90da8fc6e91a1ac38addfa68556de89d4e (diff) | |
| download | php-git-436b01e3797860add57a524b4492f8451b60ac68.tar.gz | |
Avoid dangerous optimization
| -rw-r--r-- | ext/opcache/Optimizer/block_pass.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c index ee9bda6094..e1e07ea01b 100644 --- a/ext/opcache/Optimizer/block_pass.c +++ b/ext/opcache/Optimizer/block_pass.c @@ -762,7 +762,8 @@ static void zend_optimize_block(zend_code_block *block, zend_op_array *op_array, */ if (opline->opcode == ZEND_IS_EQUAL || opline->opcode == ZEND_IS_NOT_EQUAL || - opline->opcode == ZEND_CASE) { + /* CASE variable will be deleted later by FREE, so we can't optimize it */ + (opline->opcode == ZEND_CASE && (ZEND_OP1_TYPE(opline) & (IS_CONST|IS_CV)))) { if (ZEND_OP1_TYPE(opline) == IS_CONST && (Z_TYPE(ZEND_OP1_LITERAL(opline)) == IS_FALSE || Z_TYPE(ZEND_OP1_LITERAL(opline)) == IS_TRUE)) { |