Skip to content

[pull] master from php:master #822

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
pull merged 10 commits into from
Mar 28, 2026
Merged

[pull] master from php:master #822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d28d59a
Zend/Optimizer/dfa_pass.c: refactor zend_dfa_optimize_calls() (#21549)
Girgias Mar 28, 2026
465ecaa
ext/standard: zend_string_concat2() instead of manual memcpy (#21567)
arshidkv12 Mar 28, 2026
78f2d44
uri: Preinitialize `errors` array with the correct size in `fill_erro…
LamentXU123 Mar 28, 2026
02614a2
ext/spl: zend_string_concat3() instead of manual memcpy for sub_path …
arshidkv12 Mar 28, 2026
38628e8
Fix GH-17399: iconv memory leak on bailout
iliaal Mar 26, 2026
3249f2d
Merge branch 'PHP-8.4' into PHP-8.5
iluuu1994 Mar 28, 2026
7e7607f
Merge branch 'PHP-8.5'
iluuu1994 Mar 28, 2026
5cd8777
[skip ci] Mark gh17399_substr.phpt as slow
iluuu1994 Mar 28, 2026
0a171e4
Merge branch 'PHP-8.4' into PHP-8.5
iluuu1994 Mar 28, 2026
5bb980b
Merge branch 'PHP-8.5'
iluuu1994 Mar 28, 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