diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-15 15:27:17 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-23 09:59:25 +0200 |
| commit | dcccdc471d7c6794ff9b13d3dc9c248bf7c16da9 (patch) | |
| tree | ce0f1ea9aae81cfe7f64da5eb52fa473b11a9ee5 | |
| parent | 5de750f41c1ee3ed834ebf4f811ba03a6cc2d9bc (diff) | |
| download | php-git-dcccdc471d7c6794ff9b13d3dc9c248bf7c16da9.tar.gz | |
Don't require NO_ESCAPE for partial arrays in SCCP
| -rw-r--r-- | ext/opcache/Optimizer/sccp.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/ext/opcache/Optimizer/sccp.c b/ext/opcache/Optimizer/sccp.c index 77e8083b3d..47846fec8e 100644 --- a/ext/opcache/Optimizer/sccp.c +++ b/ext/opcache/Optimizer/sccp.c @@ -1135,8 +1135,7 @@ static void sccp_visit_instr(scdf_ctx *scdf, zend_op *opline, zend_ssa_op *ssa_o if (op2 && IS_BOT(op2)) { /* Update of unknown index */ SET_RESULT_BOT(result); - if (ssa_op->op1_def >= 0 - && ctx->scdf.ssa->vars[ssa_op->op1_def].escape_state == ESCAPE_STATE_NO_ESCAPE) { + if (ssa_op->op1_def >= 0) { empty_partial_array(&zv); SET_RESULT(op1, &zv); zval_ptr_dtor_nogc(&zv); @@ -1153,8 +1152,7 @@ static void sccp_visit_instr(scdf_ctx *scdf, zend_op *opline, zend_ssa_op *ssa_o || Z_TYPE_P(op1) == IS_NULL || Z_TYPE_P(op1) == IS_FALSE || Z_TYPE_P(op1) == IS_ARRAY) - && ssa_op->op1_def >= 0 - && ctx->scdf.ssa->vars[ssa_op->op1_def].escape_state == ESCAPE_STATE_NO_ESCAPE) { + && ssa_op->op1_def >= 0) { if (Z_TYPE_P(op1) == IS_NULL || Z_TYPE_P(op1) == IS_FALSE) { empty_partial_array(&zv); @@ -1333,8 +1331,7 @@ static void sccp_visit_instr(scdf_ctx *scdf, zend_op *opline, zend_ssa_op *ssa_o if (op2 && IS_BOT(op2)) { /* Update of unknown index */ SET_RESULT_BOT(op1); - if (ssa_op->result_def >= 0 - && ctx->scdf.ssa->vars[ssa_op->result_def].escape_state == ESCAPE_STATE_NO_ESCAPE) { + if (ssa_op->result_def >= 0) { empty_partial_array(&zv); SET_RESULT(result, &zv); zval_ptr_dtor_nogc(&zv); @@ -1348,8 +1345,7 @@ static void sccp_visit_instr(scdf_ctx *scdf, zend_op *opline, zend_ssa_op *ssa_o || (opline->extended_value & ZEND_ARRAY_ELEMENT_REF)) { SET_RESULT_BOT(op1); - if (ssa_op->result_def >= 0 - && ctx->scdf.ssa->vars[ssa_op->result_def].escape_state == ESCAPE_STATE_NO_ESCAPE) { + if (ssa_op->result_def >= 0) { if (!result) { empty_partial_array(&zv); } else { @@ -1505,9 +1501,7 @@ static void sccp_visit_instr(scdf_ctx *scdf, zend_op *opline, zend_ssa_op *ssa_o } } else if (opline->extended_value == ZEND_ASSIGN_DIM) { if ((IS_PARTIAL_ARRAY(op1) || Z_TYPE_P(op1) == IS_ARRAY) - && ssa_op->op1_def >= 0 - && ctx->scdf.ssa->vars[ssa_op->op1_def].escape_state == ESCAPE_STATE_NO_ESCAPE - && op2) { + && ssa_op->op1_def >= 0 && op2) { zval tmp; zval *data = get_op1_value(ctx, opline+1, ssa_op+1); @@ -2126,7 +2120,7 @@ static void join_phi_values(zval *a, zval *b, zend_bool escape) { return; } if (IS_PARTIAL_ARRAY(a) || IS_PARTIAL_ARRAY(b)) { - if (escape || join_partial_arrays(a, b) != SUCCESS) { + if (join_partial_arrays(a, b) != SUCCESS) { zval_ptr_dtor_nogc(a); MAKE_BOT(a); } @@ -2136,7 +2130,7 @@ static void join_phi_values(zval *a, zval *b, zend_bool escape) { MAKE_BOT(a); } } else if (!zend_is_identical(a, b)) { - if (escape || join_partial_arrays(a, b) != SUCCESS) { + if (join_partial_arrays(a, b) != SUCCESS) { zval_ptr_dtor_nogc(a); MAKE_BOT(a); } |