Skip to content

Zend/Optimizer/dfa_pass.c: refactor zend_dfa_optimize_calls() #21549

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

Merged
Girgias merged 2 commits into from
Mar 28, 2026
+5 −6
Merged

Zend/Optimizer/dfa_pass.c: refactor zend_dfa_optimize_calls() #21549

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
034fe44
Zend/Optimizer/dfa_pass.c: refactor zend_dfa_optimize_calls()
Girgias Mar 27, 2026
7fa3849
revert cs
Girgias Mar 27, 2026
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
11 changes: 5 additions & 6 deletions Zend/Optimizer/dfa_pass.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,13 +398,13 @@ static bool variable_defined_or_used_in_range(zend_ssa *ssa, int var, int start,
return false;
}

int zend_dfa_optimize_calls(zend_op_array *op_array, zend_ssa *ssa)
static uint32_t zend_dfa_optimize_calls(zend_op_array *op_array, zend_ssa *ssa)
{
zend_func_info *func_info = ZEND_FUNC_INFO(op_array);
int removed_ops = 0;
const zend_func_info *func_info = ZEND_FUNC_INFO(op_array);
uint32_t removed_ops = 0;

if (func_info->callee_info) {
zend_call_info *call_info = func_info->callee_info;
const zend_call_info *call_info = func_info->callee_info;

do {
zend_op *op = call_info->caller_init_opline;
Expand All @@ -413,7 +413,6 @@ int zend_dfa_optimize_calls(zend_op_array *op_array, zend_ssa *ssa)
|| (op->opcode == ZEND_FRAMELESS_ICALL_3 && (op + 1)->op1_type == IS_CONST))
&& call_info->callee_func
&& zend_string_equals_literal_ci(call_info->callee_func->common.function_name, "in_array")) {

bool strict = false;
bool has_opdata = op->opcode == ZEND_FRAMELESS_ICALL_3;
ZEND_ASSERT(!call_info->is_prototype);
Expand All @@ -428,7 +427,7 @@ int zend_dfa_optimize_calls(zend_op_array *op_array, zend_ssa *ssa)
&& Z_TYPE_P(CT_CONSTANT_EX(op_array, op->op2.constant)) == IS_ARRAY) {
bool ok = true;

HashTable *src = Z_ARRVAL_P(CT_CONSTANT_EX(op_array, op->op2.constant));
const HashTable *src = Z_ARRVAL_P(CT_CONSTANT_EX(op_array, op->op2.constant));
HashTable *dst;
zval *val, tmp;
zend_ulong idx;
Expand Down
Loading