archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed incorrect assumption about in-memory zval type

Browse source
This commit is contained in:
Dmitry Stogov 2023-10-30 17:54:30 +03:00
parent 8b840b90e1
commit 52480b3a79
2 changed files with 41 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

42
ext/opcache/jit/zend_jit_trace.c
View file

@ -4808,14 +4808,10 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
op2_info = OP2_INFO(); op2_info = OP2_INFO();
zend_jit_addr ref_addr = 0; zend_jit_addr ref_addr = 0;
if (ra if (ssa_op->op2_def < 0 || (Z_MODE(op2_addr) == IS_REG && ssa->vars[ssa_op->op2_def].no_val)) {
&& ssa_op->op2_def >= 0
&& (!ssa->vars[ssa_op->op2_def].no_val
|| (zend_jit_trace_type_to_info(STACK_MEM_TYPE(stack, EX_VAR_TO_NUM(opline->op2.var))) & MAY_BE_ANY) !=
(op2_info & MAY_BE_ANY))) {
op2_def_addr = OP2_DEF_REG_ADDR();
} else {
op2_def_addr = op2_addr; op2_def_addr = op2_addr;
} else {
op2_def_addr = OP2_DEF_REG_ADDR();
} }
CHECK_OP2_TRACE_TYPE(); CHECK_OP2_TRACE_TYPE();
op1_info = OP1_INFO(); op1_info = OP1_INFO();
@ -4910,12 +4906,10 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
ZEND_FALLTHROUGH; ZEND_FALLTHROUGH;
case ZEND_QM_ASSIGN: case ZEND_QM_ASSIGN:
op1_addr = OP1_REG_ADDR(); op1_addr = OP1_REG_ADDR();
if (ra if (ssa_op->op1_def < 0 || (Z_MODE(op1_addr) == IS_REG && ssa->vars[ssa_op->op1_def].no_val)) {
&& ssa_op->op1_def >= 0
&& !ssa->vars[ssa_op->op1_def].no_val) {
op1_def_addr = OP1_DEF_REG_ADDR();
} else {
op1_def_addr = op1_addr; op1_def_addr = op1_addr;
} else {
op1_def_addr = OP1_DEF_REG_ADDR();
} }
op1_info = OP1_INFO(); op1_info = OP1_INFO();
CHECK_OP1_TRACE_TYPE(); CHECK_OP1_TRACE_TYPE();
@ -5008,14 +5002,10 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
break; break;
} }
op1_addr = OP1_REG_ADDR(); op1_addr = OP1_REG_ADDR();
if (ra if (ssa_op->op1_def < 0 || (Z_MODE(op1_addr) == IS_REG && ssa->vars[ssa_op->op1_def].no_val)) {
&& ssa_op->op1_def >= 0
&& (!ssa->vars[ssa_op->op1_def].no_val
|| STACK_MEM_TYPE(stack, EX_VAR_TO_NUM(opline->op1.var)) == IS_UNKNOWN
|| STACK_MEM_TYPE(stack, EX_VAR_TO_NUM(opline->op1.var)) >= IS_STRING)) {
op1_def_addr = OP1_DEF_REG_ADDR();
} else {
op1_def_addr = op1_addr; op1_def_addr = op1_addr;
} else {
op1_def_addr = OP1_DEF_REG_ADDR();
} }
op1_info = OP1_INFO(); op1_info = OP1_INFO();
CHECK_OP1_TRACE_TYPE(); CHECK_OP1_TRACE_TYPE();
@ -6195,7 +6185,14 @@ done:
SET_STACK_TYPE(stack, EX_VAR_TO_NUM(opline->op1.var), type, SET_STACK_TYPE(stack, EX_VAR_TO_NUM(opline->op1.var), type,
(gen_handler || type == IS_UNKNOWN || !ra || (gen_handler || type == IS_UNKNOWN || !ra ||
(!RA_HAS_REG(ssa_op->op1_def) && (!RA_HAS_REG(ssa_op->op1_def) &&
(opline->opcode == ZEND_ASSIGN || !ssa->vars[ssa_op->op1_def].no_val)))); !(ssa->vars[ssa_op->op1_def].no_val &&
Z_MODE(OP1_REG_ADDR()) == IS_REG &&
(opline->opcode == ZEND_QM_ASSIGN ||
opline->opcode == ZEND_SEND_VAR ||
opline->opcode == ZEND_SEND_VAR_EX ||
opline->opcode == ZEND_SEND_VAR_NO_REF ||
opline->opcode == ZEND_SEND_VAR_NO_REF_EX ||
opline->opcode == ZEND_SEND_FUNC_ARG)))));
if (type != IS_UNKNOWN) { if (type != IS_UNKNOWN) {
ssa->var_info[ssa_op->op1_def].type &= ~MAY_BE_GUARD; ssa->var_info[ssa_op->op1_def].type &= ~MAY_BE_GUARD;
if (ra && RA_HAS_REG(ssa_op->op1_def)) { if (ra && RA_HAS_REG(ssa_op->op1_def)) {
@ -6241,7 +6238,10 @@ done:
} }
SET_STACK_TYPE(stack, EX_VAR_TO_NUM(opline->op2.var), type, SET_STACK_TYPE(stack, EX_VAR_TO_NUM(opline->op2.var), type,
(gen_handler || type == IS_UNKNOWN || !ra || (gen_handler || type == IS_UNKNOWN || !ra ||
(!RA_HAS_REG(ssa_op->op2_def) /*&& !ssa->vars[ssa_op->op2_def].no_val*/))); (!RA_HAS_REG(ssa_op->op2_def) &&
!(ssa->vars[ssa_op->op2_def].no_val &&
Z_MODE(OP2_REG_ADDR()) == IS_REG &&
opline->opcode == ZEND_ASSIGN))));
if (type != IS_UNKNOWN) { if (type != IS_UNKNOWN) {
ssa->var_info[ssa_op->op2_def].type &= ~MAY_BE_GUARD; ssa->var_info[ssa_op->op2_def].type &= ~MAY_BE_GUARD;
if (ra && RA_HAS_REG(ssa_op->op2_def)) { if (ra && RA_HAS_REG(ssa_op->op2_def)) {

20
ext/opcache/tests/jit/assign_dim_017.phpt Normal file
View file

@ -0,0 +1,20 @@
--TEST--
JIT ASSIGN_DIM: 017
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.file_update_protection=0
opcache.jit_buffer_size=1M
--FILE--
<?php
function test() {
for($i = 0; $i < 10; $i++) {
$a[] = 0;
$a = false;
}
}
@test();
?>
DONE
--EXPECT--
DONE