archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Improve fix for #74456

Browse source
This commit is contained in:
Xinchen Hui 2017-04-18 12:47:53 +08:00
parent 1837eea66d
commit 187f42149d
2 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/opcache/Optimizer/block_pass.c
View file

@ -186,7 +186,7 @@ static void zend_optimize_block(zend_basic_block *block, zend_op_array *op_array
COPY_NODE(opline->op1, src->op1); COPY_NODE(opline->op1, src->op1);
VAR_SOURCE(op1) = NULL; VAR_SOURCE(op1) = NULL;
MAKE_NOP(src); MAKE_NOP(src);
} else if (opline->opcode != ZEND_FETCH_LIST && opline->opcode != ZEND_CASE) { } else {
zval c = ZEND_OP1_LITERAL(src); zval c = ZEND_OP1_LITERAL(src);
zval_copy_ctor(&c); zval_copy_ctor(&c);
if (zend_optimizer_update_op1_const(op_array, opline, &c)) { if (zend_optimizer_update_op1_const(op_array, opline, &c)) {

32
ext/opcache/Optimizer/zend_optimizer.c
View file

@ -165,6 +165,10 @@ int zend_optimizer_update_op1_const(zend_op_array *op_array,
* zend_optimizer_replace_by_const() supports this. */ * zend_optimizer_replace_by_const() supports this. */
zval_ptr_dtor(val); zval_ptr_dtor(val);
return 0; return 0;
case ZEND_CASE:
case ZEND_FETCH_LIST:
zval_ptr_dtor(val);
return 0;
case ZEND_CONCAT: case ZEND_CONCAT:
case ZEND_FAST_CONCAT: case ZEND_FAST_CONCAT:
case ZEND_FETCH_R: case ZEND_FETCH_R:
@ -417,16 +421,27 @@ int zend_optimizer_replace_by_const(zend_op_array *op_array,
*/ */
case ZEND_FETCH_LIST: { case ZEND_FETCH_LIST: {
zend_op *m = opline; zend_op *m = opline;
if (Z_TYPE_P(val) == IS_STRING) {
zend_string_hash_val(Z_STR_P(val));
}
do { do {
if (m->opcode == ZEND_FETCH_LIST && if (m->opcode == ZEND_FETCH_LIST &&
ZEND_OP1_TYPE(m) == type && ZEND_OP1_TYPE(m) == type &&
ZEND_OP1(m).var == var) { ZEND_OP1(m).var == var) {
zend_optimizer_update_op1_const(op_array, m, val); zval v;
ZVAL_COPY_VALUE(&v, val);
zval_copy_ctor(&v);
ZEND_OP1(m).constant = zend_optimizer_add_literal(op_array, &v);
ZEND_OP1_TYPE(m) = IS_CONST;
} }
m++; m++;
} while (m->opcode != ZEND_FREE || ZEND_OP1_TYPE(m) != type || ZEND_OP1(m).var != var); } while (m->opcode != ZEND_FREE || ZEND_OP1_TYPE(m) != type || ZEND_OP1(m).var != var);
ZEND_ASSERT(m->opcode == ZEND_FREE && ZEND_OP1_TYPE(m) == type && ZEND_OP1(m).var == var); ZEND_ASSERT(m->opcode == ZEND_FREE && ZEND_OP1_TYPE(m) == type && ZEND_OP1(m).var == var);
MAKE_NOP(m); MAKE_NOP(m);
zval_dtor(val);
zend_optimizer_remove_live_range(op_array, var); zend_optimizer_remove_live_range(op_array, var);
return 1; return 1;
} }
@ -460,17 +475,22 @@ int zend_optimizer_replace_by_const(zend_op_array *op_array,
} else { } else {
n = op_array->opcodes + op_array->last; n = op_array->opcodes + op_array->last;
} }
if (Z_TYPE_P(val) == IS_STRING) {
zend_string_hash_val(Z_STR_P(val));
}
while (m < n) { while (m < n) {
if (ZEND_OP1_TYPE(m) == type && if (ZEND_OP1_TYPE(m) == type &&
ZEND_OP1(m).var == var) { ZEND_OP1(m).var == var) {
if (m->opcode == ZEND_CASE if (m->opcode == ZEND_CASE
|| m->opcode == ZEND_SWITCH_LONG || m->opcode == ZEND_SWITCH_LONG
|| m->opcode == ZEND_SWITCH_STRING) { || m->opcode == ZEND_SWITCH_STRING) {
zval old_val; zval v;
ZVAL_COPY_VALUE(&old_val, val); ZVAL_COPY_VALUE(&v, val);
zval_copy_ctor(val); zval_copy_ctor(&v);
zend_optimizer_update_op1_const(op_array, m, val); ZEND_OP1(m).constant = zend_optimizer_add_literal(op_array, &v);
ZVAL_COPY_VALUE(val, &old_val); ZEND_OP1_TYPE(m) = IS_CONST;
} else if (m->opcode == ZEND_FREE) { } else if (m->opcode == ZEND_FREE) {
MAKE_NOP(m); MAKE_NOP(m);
} else { } else {