com php-src: Fixed bug #66176 (Invalid constant substitution): ext/opcache/Optimizer/block_pass.c
| From: | Dmitry Stogov | Date: | Tue, 26 Nov 2013 17:00:00 +0000 |
| Subject: | com php-src: Fixed bug #66176 (Invalid constant substitution): ext/opcache/Optimizer/block_pass.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74061@lists.php.net to get a copy of this message | ||
Commit: d79dd9cc1cab03aecf6d3f6ec243bc15aa353234
Author: Dmitry Stogov <dmitry@zend.com> Tue, 26 Nov 2013 21:00:00 +0400
Parents: 27524b52b5c051c61d8197142b29a8aafefc82bd
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d79dd9cc1cab03aecf6d3f6ec243bc15aa353234
Log:
Fixed bug #66176 (Invalid constant substitution)
Bugs:
https://bugs.php.net/66176
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 35d2ce1..8c4c58e 100644
--- a/ext/opcache/Optimizer/block_pass.c
+++ b/ext/opcache/Optimizer/block_pass.c
@@ -643,8 +643,11 @@ static void zend_optimize_block(zend_code_block *block, zend_op_array
*op_array,
opline->opcode != ZEND_FREE
) {
zend_op *src = VAR_SOURCE(opline->op1);
+ zval c = ZEND_OP1_LITERAL(src);
VAR_UNSET(opline->op1);
- update_op1_const(op_array, opline, &ZEND_OP1_LITERAL(src) TSRMLS_CC);
+ zval_copy_ctor(&c);
+ update_op1_const(op_array, opline, &c TSRMLS_CC);
+ literal_dtor(&ZEND_OP1_LITERAL(src));
MAKE_NOP(src);
}
@@ -654,8 +657,11 @@ static void zend_optimize_block(zend_code_block *block, zend_op_array
*op_array,
VAR_SOURCE(opline->op2)->opcode == ZEND_QM_ASSIGN &&
ZEND_OP1_TYPE(VAR_SOURCE(opline->op2)) == IS_CONST) {
zend_op *src = VAR_SOURCE(opline->op2);
+ zval c = ZEND_OP1_LITERAL(src);
VAR_UNSET(opline->op2);
- update_op2_const(op_array, opline, &ZEND_OP1_LITERAL(src) TSRMLS_CC);
+ zval_copy_ctor(&c);
+ update_op2_const(op_array, opline, &c TSRMLS_CC);
+ literal_dtor(&ZEND_OP1_LITERAL(src));
MAKE_NOP(src);
}