php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4'

Browse Source 
* PHP-8.4:
  Fix may_have_extra_named_args flag for ZEND_AST_UNPACK
This commit is contained in:
Niels Dossche
2025-01-21 19:27:24 +01:00
parent c218f62920 0b12db6afa
commit 75bd1a9dc0
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Zend/zend_compile.c
View File

@@ -3749,6 +3749,12 @@ static uint32_t zend_compile_args(
"Cannot use argument unpacking after named arguments");
}
/* Unpack may contain named arguments. */
may_have_undef = 1;
if (!fbc || (fbc->common.fn_flags & ZEND_ACC_VARIADIC)) {
*may_have_extra_named_args = 1;
}
uses_arg_unpack = 1;
fbc = NULL;
@@ -3757,11 +3763,6 @@ static uint32_t zend_compile_args(
opline->op2.num = arg_count;
opline->result.var = EX_NUM_TO_VAR(arg_count - 1);
/* Unpack may contain named arguments. */
may_have_undef = 1;
if (!fbc || (fbc->common.fn_flags & ZEND_ACC_VARIADIC)) {
*may_have_extra_named_args = 1;
}
continue;
}