Skip to content

Fix GH-20377: emit assignment for all final promoted properties #20378

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
merged 3 commits into from
Nov 3, 2025
Merged

Fix GH-20377: emit assignment for all final promoted properties #20378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbc4e8b
Fix GH-20377: emit assignment for all final promoted properties
DanielEScherzer Nov 3, 2025
f0d06b1
Deduplicate list of flags
DanielEScherzer Nov 3, 2025
fdb5553
NEWS
DanielEScherzer Nov 3, 2025
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
2 changes: 2 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ PHP NEWS
(ilutov)
. Fixed bug GH-20194 (null offset deprecation not emitted for writes).
(Girgias)
. Fixed bug GH-GH-20377 (final promoted properties without explicit visibility
not automatically assigned). (DanielEScherzer)

- Opcache:
. Fixed bug GH-20012 (heap buffer overflow in jit). (Arnaud)
Expand Down
23 changes: 23 additions & 0 deletions Zend/tests/ctor_promotion/ctor_promotion_final.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--TEST--
GH-20377: Constructor promotion with a final property without visibility set
--FILE--
<?php

class Demo {
public function __construct(
final string $foo,
final public string $bar,
) {}
}

$d = new Demo("first", "second");
var_dump($d);

?>
--EXPECTF--
object(Demo)#%d (2) {
["foo"]=>
string(5) "first"
["bar"]=>
string(6) "second"
}
5 changes: 3 additions & 2 deletions Zend/zend_compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7770,6 +7770,7 @@ static void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast, uint32
}
}

const uint32_t promotion_flags = ZEND_ACC_PPP_MASK | ZEND_ACC_PPP_SET_MASK | ZEND_ACC_READONLY | ZEND_ACC_FINAL;
for (i = 0; i < list->children; ++i) {
zend_ast *param_ast = list->child[i];
zend_ast *type_ast = param_ast->child[0];
Expand All @@ -7781,7 +7782,7 @@ static void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast, uint32
zend_string *name = zval_make_interned_string(zend_ast_get_zval(var_ast));
bool is_ref = (param_ast->attr & ZEND_PARAM_REF) != 0;
bool is_variadic = (param_ast->attr & ZEND_PARAM_VARIADIC) != 0;
uint32_t property_flags = param_ast->attr & (ZEND_ACC_PPP_MASK | ZEND_ACC_PPP_SET_MASK | ZEND_ACC_READONLY | ZEND_ACC_FINAL);
uint32_t property_flags = param_ast->attr & promotion_flags;
bool is_promoted = property_flags || hooks_ast;

CG(zend_lineno) = param_ast->lineno;
Expand Down Expand Up @@ -8008,7 +8009,7 @@ static void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast, uint32
zend_ast *param_ast = list->child[i];
zend_ast *hooks_ast = param_ast->child[5];
bool is_ref = (param_ast->attr & ZEND_PARAM_REF) != 0;
uint32_t flags = param_ast->attr & (ZEND_ACC_PPP_MASK | ZEND_ACC_PPP_SET_MASK | ZEND_ACC_READONLY);
uint32_t flags = param_ast->attr & promotion_flags;
bool is_promoted = flags || hooks_ast;
if (!is_promoted) {
continue;
Expand Down