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

BIND_STATIC of implicit binding may be undef

Browse source 
Even though we don't need it at runtime, add the BIND_IMPLICIT
flag to BIND_STATIC as well, so we can distinguish this case in
type inference.

This fixes a JIT miscompile in arrow_functions/002.phpt.
This commit is contained in:
Nikita Popov 2019-05-27 17:11:44 +02:00
parent 070f877b76
commit fd23f9104a
4 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Zend/zend_compile.c
View file

@ -4012,7 +4012,7 @@ void zend_compile_global_var(zend_ast *ast) /* {{{ */
} }
/* }}} */ /* }}} */
static void zend_compile_static_var_common(zend_string *var_name, zval *value, uint32_t by_ref) /* {{{ */ static void zend_compile_static_var_common(zend_string *var_name, zval *value, uint32_t mode) /* {{{ */
{ {
zend_op *opline; zend_op *opline;
if (!CG(active_op_array)->static_variables) { if (!CG(active_op_array)->static_variables) {
@ -4031,7 +4031,7 @@ static void zend_compile_static_var_common(zend_string *var_name, zval *value, u
opline = zend_emit_op(NULL, ZEND_BIND_STATIC, NULL, NULL); opline = zend_emit_op(NULL, ZEND_BIND_STATIC, NULL, NULL);
opline->op1_type = IS_CV; opline->op1_type = IS_CV;
opline->op1.var = lookup_cv(var_name); opline->op1.var = lookup_cv(var_name);
opline->extended_value = (uint32_t)((char*)value - (char*)CG(active_op_array)->static_variables->arData) | by_ref; opline->extended_value = (uint32_t)((char*)value - (char*)CG(active_op_array)->static_variables->arData) | mode;
} }
/* }}} */ /* }}} */
@ -5584,7 +5584,7 @@ static void zend_compile_closure_uses(zend_ast *ast) /* {{{ */
} }
} }
zend_compile_static_var_common(var_name, &zv, var_ast->attr); zend_compile_static_var_common(var_name, &zv, var_ast->attr ? ZEND_BIND_REF : 0);
} }
} }
/* }}} */ /* }}} */
@ -5595,7 +5595,7 @@ static void zend_compile_implicit_closure_uses(closure_info *info)
ZEND_HASH_FOREACH_STR_KEY(&info->uses, var_name) ZEND_HASH_FOREACH_STR_KEY(&info->uses, var_name)
zval zv; zval zv;
ZVAL_NULL(&zv); ZVAL_NULL(&zv);
zend_compile_static_var_common(var_name, &zv, 0); zend_compile_static_var_common(var_name, &zv, ZEND_BIND_IMPLICIT);
ZEND_HASH_FOREACH_END(); ZEND_HASH_FOREACH_END();
} }

2
Zend/zend_vm_def.h
View file

@ -8220,7 +8220,7 @@ ZEND_VM_HANDLER(183, ZEND_BIND_STATIC, CV, UNUSED, REF)
ZEND_MAP_PTR_SET(EX(func)->op_array.static_variables_ptr, ht); ZEND_MAP_PTR_SET(EX(func)->op_array.static_variables_ptr, ht);
} }
value = (zval*)((char*)ht->arData + (opline->extended_value & ~ZEND_BIND_REF)); value = (zval*)((char*)ht->arData + (opline->extended_value & ~(ZEND_BIND_REF|ZEND_BIND_IMPLICIT)));
if (opline->extended_value & ZEND_BIND_REF) { if (opline->extended_value & ZEND_BIND_REF) {
if (Z_TYPE_P(value) == IS_CONSTANT_AST) { if (Z_TYPE_P(value) == IS_CONSTANT_AST) {

2
Zend/zend_vm_execute.h
View file

@ -50848,7 +50848,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BIND_STATIC_SPEC_CV_UNUSED_HAN
ZEND_MAP_PTR_SET(EX(func)->op_array.static_variables_ptr, ht); ZEND_MAP_PTR_SET(EX(func)->op_array.static_variables_ptr, ht);
} }
value = (zval*)((char*)ht->arData + (opline->extended_value & ~ZEND_BIND_REF)); value = (zval*)((char*)ht->arData + (opline->extended_value & ~(ZEND_BIND_REF|ZEND_BIND_IMPLICIT)));
if (opline->extended_value & ZEND_BIND_REF) { if (opline->extended_value & ZEND_BIND_REF) {
if (Z_TYPE_P(value) == IS_CONSTANT_AST) { if (Z_TYPE_P(value) == IS_CONSTANT_AST) {

3
ext/opcache/Optimizer/zend_inference.c
View file

@ -3025,6 +3025,9 @@ static int zend_update_type_info(const zend_op_array *op_array,
case ZEND_BIND_STATIC: case ZEND_BIND_STATIC:
tmp = MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF tmp = MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF
| ((opline->extended_value & ZEND_BIND_REF) ? MAY_BE_REF : (MAY_BE_RC1 | MAY_BE_RCN)); | ((opline->extended_value & ZEND_BIND_REF) ? MAY_BE_REF : (MAY_BE_RC1 | MAY_BE_RCN));
if (opline->extended_value & ZEND_BIND_IMPLICIT) {
tmp |= MAY_BE_UNDEF;
}
UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def); UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def);
break; break;
case ZEND_SEND_VAR: case ZEND_SEND_VAR: