Skip to content

[pull] master from php:master #697

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
Jan 29, 2026
Merged

[pull] master from php:master #697

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
371422b
Zend/zend_call_stack.h: fix missing include on Windows (clang compat)…
dunglas Jan 29, 2026
59433f8
Merge branch 'PHP-8.4' into PHP-8.5
TimWolla Jan 29, 2026
cd1e19a
Merge branch 'PHP-8.5'
TimWolla Jan 29, 2026
23f4b93
gen_stub: Fix compatibility with php 7.4 (in PHP-8.4) (#21076)
thg2k Jan 29, 2026
b2bb31c
Merge branch 'PHP-8.4' into PHP-8.5
TimWolla Jan 29, 2026
5cd759a
Merge branch 'PHP-8.5'
TimWolla Jan 29, 2026
7ec14e3
gen_stub: Fix compatibility with php 7.4 (in PHP-8.5+) (#21075)
thg2k Jan 29, 2026
149d34d
Merge branch 'PHP-8.5'
TimWolla Jan 29, 2026
2f2b421
Fix segfault when preloading constant AST closure
iluuu1994 Jan 28, 2026
db24ca5
Merge branch 'PHP-8.5'
iluuu1994 Jan 29, 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
6 changes: 6 additions & 0 deletions Zend/zend_ast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,6 +1247,12 @@ static zend_result ZEND_FASTCALL zend_ast_evaluate_inner(
}
case ZEND_AST_OP_ARRAY:
{
// Preloading will attempt to resolve constants but objects can't be stored in shm
// Aborting here to store the const AST instead
if (CG(in_compilation)) {
return FAILURE;
}

zend_function *func = (zend_function *)zend_ast_get_op_array(ast)->op_array;

zend_create_closure(result, func, scope, scope, NULL);
Expand Down
3 changes: 3 additions & 0 deletions Zend/zend_call_stack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@

#include "zend.h"
#include "zend_portability.h"
#ifdef _MSC_VER
# include <intrin.h>
#endif
#ifdef __APPLE__
# include <pthread.h>
#endif
Expand Down
2 changes: 1 addition & 1 deletion build/gen_stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2235,7 +2235,7 @@ public function __clone()

class EvaluatedValue
{
public /* readonly */ mixed $value;
public /* readonly */ /* mixed */ $value;
public SimpleType $type;
public Expr $expr;
public bool $isUnknownConstValue;
Expand Down
7 changes: 7 additions & 0 deletions ext/opcache/tests/preload_gh21059.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?php

class Foo {
public const C = static function() {
echo "Hello world\n";
};
}
18 changes: 18 additions & 0 deletions ext/opcache/tests/preload_gh21059.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
--TEST--
GH-21059: Segfault when preloading constant AST closure
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.preload={PWD}/preload_gh21059.inc
--EXTENSIONS--
opcache
--SKIPIF--
<?php
if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
?>
--FILE--
<?php
(Foo::C)();
?>
--EXPECT--
Hello world