Skip to content

zend_compile: Set op_array->scope for Closures as compile time #18552

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+135 −0
Open

zend_compile: Set op_array->scope for Closures as compile time #18552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
955da0a
zend_compile: Set `op_array->scope` for Closures as compile time
TimWolla May 14, 2025
0ec7095
Prevent the scope from affecting `__METHOD__`
TimWolla May 14, 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
9 changes: 9 additions & 0 deletions Zend/zend_compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8462,6 +8462,15 @@ static zend_op_array *zend_compile_func_decl_ex(
/* Pop the loop variable stack separator */
zend_stack_del_top(&CG(loop_var_stack));

if (op_array->fn_flags & ZEND_ACC_CLOSURE) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In #10782 (comment) there is also a condition to skip this for traits, not sure, but highly likely there is a missing test for it with observer.

/* Set the closure scope at compile time as an optimization to
* prevent creating a separate runtime cache for every initialization
* of this closure. Most closures are expected not to change their
* scope in practice.
*/
op_array->scope = CG(active_class_entry);
}

if (level == FUNC_DECL_LEVEL_TOPLEVEL) {
zend_observer_function_declared_notify(op_array, lcname);
}
Expand Down
126 changes: 126 additions & 0 deletions ext/zend_test/tests/observer_closure_04.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
--TEST--
Observer: Closures keep their runtime cache when not rebinding
--EXTENSIONS--
zend_test
--INI--
zend_test.observer.enabled=1
zend_test.observer.show_output=1
zend_test.observer.observe_all=1
--FILE--
<?php

class Foo {
private static $value = "x";
function static() {
(static function () {
echo Foo::$value, PHP_EOL;
})();
}
function non_static() {
(function () {
echo Foo::$value, PHP_EOL;
})();
}
function rebind() {
((function () {
try {
echo Foo::$value, PHP_EOL;
} catch (Error $e) {
echo $e::class, ": ", $e->getMessage(), PHP_EOL;
}
})->bindTo(null, null))();
}
}

$obj = new Foo();
$obj->static();
$obj->static();
$obj->non_static();
$obj->non_static();
$obj->rebind();
$obj->rebind();

$closure = function () {
echo Foo::$value, PHP_EOL;
};

($closure->bindTo(null, Foo::class))();
($closure->bindTo(null, Foo::class))();

$boundClosure = $closure->bindTo(null, Foo::class);
$boundClosure();
$boundClosure();

?>
--EXPECTF--
<!-- init '%s' -->
<file '%s'>
<!-- init Foo::static() -->
<Foo::static>
<!-- init Foo::{closure:Foo::static():6}() -->
<Foo::{closure:Foo::static():6}>
x
</Foo::{closure:Foo::static():6}>
</Foo::static>
<Foo::static>
<Foo::{closure:Foo::static():6}>
x
</Foo::{closure:Foo::static():6}>
</Foo::static>
<!-- init Foo::non_static() -->
<Foo::non_static>
<!-- init Foo::{closure:Foo::non_static():11}() -->
<Foo::{closure:Foo::non_static():11}>
x
</Foo::{closure:Foo::non_static():11}>
</Foo::non_static>
<Foo::non_static>
<Foo::{closure:Foo::non_static():11}>
x
</Foo::{closure:Foo::non_static():11}>
</Foo::non_static>
<!-- init Foo::rebind() -->
<Foo::rebind>
<!-- init Closure::bindTo() -->
<Closure::bindTo>
</Closure::bindTo>
<!-- init {closure:Foo::rebind():16}() -->
<{closure:Foo::rebind():16}>
Error: <!-- init Error::getMessage() -->
<Error::getMessage>
</Error::getMessage>
Cannot access private property Foo::$value
</{closure:Foo::rebind():16}>
</Foo::rebind>
<Foo::rebind>
<Closure::bindTo>
</Closure::bindTo>
<!-- init {closure:Foo::rebind():16}() -->
<{closure:Foo::rebind():16}>
Error: <Error::getMessage>
</Error::getMessage>
Cannot access private property Foo::$value
</{closure:Foo::rebind():16}>
</Foo::rebind>
<Closure::bindTo>
</Closure::bindTo>
<!-- init Foo::{closure:%s:%d}() -->
<Foo::{closure:%s:%d}>
x
</Foo::{closure:%s:%d}>
<Closure::bindTo>
</Closure::bindTo>
<!-- init Foo::{closure:%s:%d}() -->
<Foo::{closure:%s:%d}>
x
</Foo::{closure:%s:%d}>
<Closure::bindTo>
</Closure::bindTo>
<!-- init Foo::{closure:%s:%d}() -->
<Foo::{closure:%s:%d}>
x
</Foo::{closure:%s:%d}>
<Foo::{closure:%s:%d}>
x
</Foo::{closure:%s:%d}>
</file '%s'>
Loading