Skip to content

Fix tssa ce type inference #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix tssa ce type inference #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 22 additions & 16 deletions Zend/Optimizer/zend_inference.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2368,7 +2368,7 @@ static uint32_t zend_convert_type_declaration_mask(uint32_t type_mask) {
return result_mask;
}

static uint32_t zend_convert_type(const zend_script *script, zend_type type, zend_class_entry **pce)
static uint32_t zend_convert_type(const zend_script *script, zend_type type, zend_class_entry **pce, zend_string *filename)
{
if (pce) {
*pce = NULL;
Expand All @@ -2387,7 +2387,7 @@ static uint32_t zend_convert_type(const zend_script *script, zend_type type, zen
if (ZEND_TYPE_HAS_NAME(type)) {
zend_string *lcname = zend_string_tolower(ZEND_TYPE_NAME(type));
// TODO: Pass through op_array.
*pce = zend_optimizer_get_class_entry(script, NULL, lcname);
*pce = zend_optimizer_get_class_entry_ex(script, NULL, lcname, filename);
zend_string_release_ex(lcname, 0);
}
}
Expand All @@ -2398,9 +2398,14 @@ static uint32_t zend_convert_type(const zend_script *script, zend_type type, zen
return tmp;
}

ZEND_API uint32_t zend_fetch_arg_info_type_ex(const zend_script *script, const zend_arg_info *arg_info, zend_class_entry **pce, zend_string *filename)
{
return zend_convert_type(script, arg_info->type, pce, filename);
}

ZEND_API uint32_t zend_fetch_arg_info_type(const zend_script *script, const zend_arg_info *arg_info, zend_class_entry **pce)
{
return zend_convert_type(script, arg_info->type, pce);
return zend_fetch_arg_info_type_ex(script, arg_info, pce, NULL);
}

static const zend_property_info *lookup_prop_info(const zend_class_entry *ce, zend_string *name, zend_class_entry *scope) {
Expand Down Expand Up @@ -2489,7 +2494,7 @@ static const zend_property_info *zend_fetch_static_prop_info(const zend_script *
return prop_info;
}

static uint32_t zend_fetch_prop_type(const zend_script *script, const zend_property_info *prop_info, zend_class_entry **pce)
static uint32_t zend_fetch_prop_type(const zend_script *script, const zend_property_info *prop_info, zend_class_entry **pce, zend_string *filename)
{
if (!prop_info) {
if (pce) {
Expand All @@ -2498,7 +2503,7 @@ static uint32_t zend_fetch_prop_type(const zend_script *script, const zend_prope
return MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_RC1 | MAY_BE_RCN;
}

return zend_convert_type(script, prop_info->type, pce);
return zend_convert_type(script, prop_info->type, pce, NULL);
}

static bool result_may_be_separated(zend_ssa *ssa, zend_ssa_op *ssa_op)
Expand Down Expand Up @@ -2748,7 +2753,7 @@ static zend_always_inline zend_result _zend_update_type_info(
if (opline->opcode == ZEND_ASSIGN_OBJ_OP) {
prop_info = zend_fetch_prop_info(op_array, ssa, opline, ssa_op);
orig = t1;
t1 = zend_fetch_prop_type(script, prop_info, NULL);
t1 = zend_fetch_prop_type(script, prop_info, NULL, op_array->filename);
t2 = OP1_DATA_INFO();
} else if (opline->opcode == ZEND_ASSIGN_DIM_OP) {
if (t1 & MAY_BE_ARRAY_OF_REF) {
Expand All @@ -2759,7 +2764,7 @@ static zend_always_inline zend_result _zend_update_type_info(
t2 = OP1_DATA_INFO();
} else if (opline->opcode == ZEND_ASSIGN_STATIC_PROP_OP) {
prop_info = zend_fetch_static_prop_info(script, op_array, ssa, opline);
t1 = zend_fetch_prop_type(script, prop_info, NULL);
t1 = zend_fetch_prop_type(script, prop_info, NULL, op_array->filename);
t2 = OP1_DATA_INFO();
} else {
if (t1 & MAY_BE_REF) {
Expand Down Expand Up @@ -2821,7 +2826,7 @@ static zend_always_inline zend_result _zend_update_type_info(
} else if (opline->opcode == ZEND_ASSIGN_OBJ_OP) {
/* The return value must also satisfy the property type */
if (prop_info) {
t1 = zend_fetch_prop_type(script, prop_info, &ce);
t1 = zend_fetch_prop_type(script, prop_info, &ce, op_array->filename);
if ((t1 & (MAY_BE_LONG|MAY_BE_DOUBLE)) == MAY_BE_LONG
&& (tmp & (MAY_BE_LONG|MAY_BE_DOUBLE)) == MAY_BE_DOUBLE) {
/* DOUBLE may be auto-converted to LONG */
Expand All @@ -2840,7 +2845,7 @@ static zend_always_inline zend_result _zend_update_type_info(
} else if (opline->opcode == ZEND_ASSIGN_STATIC_PROP_OP) {
/* The return value must also satisfy the property type */
if (prop_info) {
t1 = zend_fetch_prop_type(script, prop_info, &ce);
t1 = zend_fetch_prop_type(script, prop_info, &ce, op_array->filename);
if ((t1 & (MAY_BE_LONG|MAY_BE_DOUBLE)) == MAY_BE_LONG
&& (tmp & (MAY_BE_LONG|MAY_BE_DOUBLE)) == MAY_BE_DOUBLE) {
/* DOUBLE may be auto-converted to LONG */
Expand Down Expand Up @@ -3037,7 +3042,7 @@ static zend_always_inline zend_result _zend_update_type_info(
if (ssa_op->result_def >= 0) {
// TODO: If there is no __set we might do better
tmp = zend_fetch_prop_type(script,
zend_fetch_prop_info(op_array, ssa, opline, ssa_op), &ce);
zend_fetch_prop_info(op_array, ssa, opline, ssa_op), &ce, op_array->filename);
UPDATE_SSA_TYPE(tmp, ssa_op->result_def);
if (ce) {
UPDATE_SSA_OBJ_TYPE(ce, 1, ssa_op->result_def);
Expand Down Expand Up @@ -3307,7 +3312,7 @@ static zend_always_inline zend_result _zend_update_type_info(
zend_arg_info *arg_info = &op_array->arg_info[opline->op1.num-1];

ce = NULL;
tmp = zend_fetch_arg_info_type(script, arg_info, &ce);
tmp = zend_fetch_arg_info_type_ex(script, arg_info, &ce, op_array->filename);
if (ZEND_ARG_SEND_MODE(arg_info)) {
tmp |= MAY_BE_REF;
ce = NULL;
Expand Down Expand Up @@ -3780,7 +3785,7 @@ static zend_always_inline zend_result _zend_update_type_info(
}
if (opline->op1_type == IS_UNUSED || (t1 & MAY_BE_OBJECT)) {
const zend_property_info *prop_info = zend_fetch_prop_info(op_array, ssa, opline, ssa_op);
tmp |= zend_fetch_prop_type(script, prop_info, &ce);
tmp |= zend_fetch_prop_type(script, prop_info, &ce, op_array->filename);
if (opline->opcode != ZEND_FETCH_OBJ_R && opline->opcode != ZEND_FETCH_OBJ_IS) {
tmp |= MAY_BE_REF | MAY_BE_INDIRECT;
if ((opline->extended_value & ZEND_FETCH_OBJ_FLAGS) == ZEND_FETCH_DIM_WRITE) {
Expand Down Expand Up @@ -3822,7 +3827,7 @@ static zend_always_inline zend_result _zend_update_type_info(
case ZEND_FETCH_STATIC_PROP_UNSET:
case ZEND_FETCH_STATIC_PROP_FUNC_ARG:
tmp = zend_fetch_prop_type(script,
zend_fetch_static_prop_info(script, op_array, ssa, opline), &ce);
zend_fetch_static_prop_info(script, op_array, ssa, opline), &ce, op_array->filename);
if (opline->opcode != ZEND_FETCH_STATIC_PROP_R
&& opline->opcode != ZEND_FETCH_STATIC_PROP_IS) {
tmp |= MAY_BE_REF | MAY_BE_INDIRECT;
Expand Down Expand Up @@ -3914,7 +3919,7 @@ static zend_always_inline zend_result _zend_update_type_info(
UPDATE_SSA_TYPE(MAY_BE_RC1|MAY_BE_RCN|MAY_BE_ANY|MAY_BE_ARRAY_KEY_ANY|MAY_BE_ARRAY_OF_ANY, ssa_op->result_def);
break;
}
UPDATE_SSA_TYPE(zend_convert_type(script, cc->type, &ce), ssa_op->result_def);
UPDATE_SSA_TYPE(zend_convert_type(script, cc->type, &ce, op_array->filename), ssa_op->result_def);
if (ce) {
UPDATE_SSA_OBJ_TYPE(ce, /* is_instanceof */ true, ssa_op->result_def);
}
Expand Down Expand Up @@ -3962,7 +3967,7 @@ static zend_always_inline zend_result _zend_update_type_info(
ce = NULL;
} else {
zend_arg_info *ret_info = op_array->arg_info - 1;
tmp = zend_fetch_arg_info_type(script, ret_info, &ce);
tmp = zend_fetch_arg_info_type_ex(script, ret_info, &ce, op_array->filename);
if ((tmp & MAY_BE_NULL) && opline->op1_type == IS_CV) {
tmp |= MAY_BE_UNDEF;
}
Expand Down Expand Up @@ -4018,7 +4023,7 @@ static zend_always_inline zend_result _zend_update_type_info(
if (ssa_op->result_def >= 0) {
const zend_property_info *prop_info = zend_fetch_static_prop_info(script, op_array, ssa, opline);
zend_class_entry *prop_ce;
tmp = zend_fetch_prop_type(script, prop_info, &prop_ce);
tmp = zend_fetch_prop_type(script, prop_info, &prop_ce, op_array->filename);
/* Internal objects may result in essentially anything. */
if (tmp & MAY_BE_OBJECT) {
goto unknown_opcode;
Expand Down Expand Up @@ -4516,6 +4521,7 @@ uint32_t zend_get_return_info_from_signature_only(
(use_tentative_return_info || !ZEND_ARG_TYPE_IS_TENTATIVE(func->common.arg_info - 1))
) {
zend_arg_info *ret_info = func->common.arg_info - 1;
// FIXME: Script file check?
type = zend_fetch_arg_info_type(script, ret_info, ce);
*ce_is_instanceof = ce != NULL;
} else {
Expand Down
2 changes: 2 additions & 0 deletions Zend/Optimizer/zend_inference.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,8 @@ ZEND_API bool zend_inference_propagate_range(const zend_op_array *op_array, cons

ZEND_API uint32_t zend_fetch_arg_info_type(
const zend_script *script, const zend_arg_info *arg_info, zend_class_entry **pce);
ZEND_API uint32_t zend_fetch_arg_info_type_ex(
const zend_script *script, const zend_arg_info *arg_info, zend_class_entry **pce, zend_string *filename);
ZEND_API void zend_init_func_return_info(
const zend_op_array *op_array, const zend_script *script, zend_ssa_var_info *ret);
uint32_t zend_get_return_info_from_signature_only(
Expand Down
14 changes: 11 additions & 3 deletions Zend/Optimizer/zend_optimizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,15 +830,18 @@ static bool zend_optimizer_ignore_function(zval *fbc_zv, zend_string *filename)
}
}

zend_class_entry *zend_optimizer_get_class_entry(
const zend_script *script, const zend_op_array *op_array, zend_string *lcname) {
zend_class_entry *zend_optimizer_get_class_entry_ex(
const zend_script *script, const zend_op_array *op_array, zend_string *lcname, zend_string *filename) {
zend_class_entry *ce = script ? zend_hash_find_ptr(&script->class_table, lcname) : NULL;
if (ce) {
return ce;
}

if (!filename && op_array) {
filename = op_array->filename;
}
zval *ce_zv = zend_hash_find(CG(class_table), lcname);
if (ce_zv && !zend_optimizer_ignore_class(ce_zv, op_array ? op_array->filename : NULL)) {
if (ce_zv && !zend_optimizer_ignore_class(ce_zv, filename)) {
return Z_PTR_P(ce_zv);
}

Expand All @@ -849,6 +852,11 @@ zend_class_entry *zend_optimizer_get_class_entry(
return NULL;
}

zend_class_entry *zend_optimizer_get_class_entry(
const zend_script *script, const zend_op_array *op_array, zend_string *lcname) {
return zend_optimizer_get_class_entry_ex(script, op_array, lcname, NULL);
}

zend_class_entry *zend_optimizer_get_class_entry_from_op1(
const zend_script *script, const zend_op_array *op_array, const zend_op *opline) {
if (opline->op1_type == IS_CONST) {
Expand Down
2 changes: 2 additions & 0 deletions Zend/Optimizer/zend_optimizer_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ bool zend_optimizer_replace_by_const(zend_op_array *op_array,
zend_op *zend_optimizer_get_loop_var_def(const zend_op_array *op_array, zend_op *free_opline);
zend_class_entry *zend_optimizer_get_class_entry(
const zend_script *script, const zend_op_array *op_array, zend_string *lcname);
zend_class_entry *zend_optimizer_get_class_entry_ex(
const zend_script *script, const zend_op_array *op_array, zend_string *lcname, zend_string *filename);
zend_class_entry *zend_optimizer_get_class_entry_from_op1(
const zend_script *script, const zend_op_array *op_array, const zend_op *opline);
const zend_class_constant *zend_fetch_class_const_info(
Expand Down
8 changes: 4 additions & 4 deletions ext/opcache/jit/zend_jit_trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1683,7 +1683,7 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
if (op_array->arg_info && i < trace_buffer[1].opline - op_array->opcodes) {
zend_arg_info *arg_info = &op_array->arg_info[i];
zend_class_entry *ce;
uint32_t tmp = zend_fetch_arg_info_type(script, arg_info, &ce);
uint32_t tmp = zend_fetch_arg_info_type_ex(script, arg_info, &ce, op_array->filename);

if (ZEND_ARG_SEND_MODE(arg_info)) {
tmp |= MAY_BE_REF;
Expand Down Expand Up @@ -2144,7 +2144,7 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
arg_info = &frame->call->func->op_array.arg_info[opline->op2.num - 1];
if (ZEND_TYPE_IS_SET(arg_info->type)) {
zend_class_entry *ce;
uint32_t tmp = zend_fetch_arg_info_type(script, arg_info, &ce);
uint32_t tmp = zend_fetch_arg_info_type_ex(script, arg_info, &ce, op_array->filename);
info &= tmp;
if (!info) {
break;
Expand Down Expand Up @@ -2480,7 +2480,7 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
if (op_array->arg_info) {
zend_arg_info *arg_info = &op_array->arg_info[i];
zend_class_entry *ce;
uint32_t tmp = zend_fetch_arg_info_type(script, arg_info, &ce);
uint32_t tmp = zend_fetch_arg_info_type_ex(script, arg_info, &ce, op_array->filename);

if (ZEND_ARG_SEND_MODE(arg_info)) {
tmp |= MAY_BE_REF;
Expand Down Expand Up @@ -2647,7 +2647,7 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
zend_class_entry *ce;
const zend_function *func = p->func;
zend_arg_info *ret_info = func->common.arg_info - 1;
uint32_t ret_type = zend_fetch_arg_info_type(NULL, ret_info, &ce);
uint32_t ret_type = zend_fetch_arg_info_type_ex(NULL, ret_info, &ce, op_array->filename);

ssa_var_info[ssa_ops[idx-1].result_def].type &= ret_type;
}
Expand Down
Loading