Skip to content

Commit e3d7c69

Browse files
committed
Improve ZEND_NEW RC inference
ZEND_NEW returns RC1 if the instanciated class has no constructor.
1 parent 52dba99 commit e3d7c69

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

Zend/Optimizer/zend_inference.c

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3369,8 +3369,22 @@ static zend_always_inline zend_result _zend_update_type_info(
33693369
ce = zend_optimizer_get_class_entry_from_op1(script, op_array, opline);
33703370
if (ce) {
33713371
UPDATE_SSA_OBJ_TYPE(ce, 0, ssa_op->result_def);
3372+
/* New objects without constructors cannot escape. */
3373+
if (!ce->constructor
3374+
&& !ce->create_object
3375+
&& ce->default_object_handlers->get_constructor == zend_std_get_constructor) {
3376+
tmp &= ~MAY_BE_RCN;
3377+
}
33723378
} else if ((t1 & MAY_BE_CLASS) && ssa_op->op1_use >= 0 && ssa_var_info[ssa_op->op1_use].ce) {
3373-
UPDATE_SSA_OBJ_TYPE(ssa_var_info[ssa_op->op1_use].ce, ssa_var_info[ssa_op->op1_use].is_instanceof, ssa_op->result_def);
3379+
ce = ssa_var_info[ssa_op->op1_use].ce;
3380+
UPDATE_SSA_OBJ_TYPE(ce, ssa_var_info[ssa_op->op1_use].is_instanceof, ssa_op->result_def);
3381+
/* New objects without constructors cannot escape. */
3382+
if (!ssa_var_info[ssa_op->result_def].is_instanceof
3383+
&& !ce->constructor
3384+
&& !ce->create_object
3385+
&& ce->default_object_handlers->get_constructor == zend_std_get_constructor) {
3386+
tmp &= ~MAY_BE_RCN;
3387+
}
33743388
} else {
33753389
UPDATE_SSA_OBJ_TYPE(NULL, 0, ssa_op->result_def);
33763390
}

0 commit comments

Comments
 (0)