Skip to content

Fix escape analysis for objects implementing ArrayAccess #24089

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
ndossche wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+54 −0
Open

Fix escape analysis for objects implementing ArrayAccess #24089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions Zend/Optimizer/escape_analysis.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,9 @@ static bool is_allocation_def(zend_op_array *op_array, zend_ssa *ssa, int def, i
&& !ce->__set
&& !ce->__isset
&& !ce->num_hooked_props
/* ArrayAccess methods receive the object, interfaces of unlinked classes are unknown */
&& !ce->arrayaccess_funcs_ptr
&& ((ce->ce_flags & ZEND_ACC_LINKED) || !ce->num_interfaces)
&& !(ce->ce_flags & forbidden_flags)
&& (ce->ce_flags & ZEND_ACC_CONSTANTS_UPDATED)) {
return 1;
Expand Down
51 changes: 51 additions & 0 deletions ext/opcache/tests/opt/escape_analysis_array_access.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
--TEST--
Escape analysis: objects implementing ArrayAccess escape through dimension accesses
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.optimization_level=-1
--EXTENSIONS--
opcache
--FILE--
<?php
#[AllowDynamicProperties]
class AA implements ArrayAccess {
function offsetExists($o): bool { $this->x = 3; return true; }
function offsetGet($o): mixed { $this->x = 2; return 42; }
function offsetSet($o, $v): void { $this->x = 4; }
function offsetUnset($o): void {}

static function fetch() {
$o = new self;
$o->x = 1;
$o[0];
return $o->x;
}

static function isset() {
$o = new self;
$o->x = 1;
return [isset($o[0]), $o->x];
}

static function assign() {
$o = new self;
$o->x = 1;
$o[0] = 1;
return $o->x;
}
}

var_dump(AA::fetch());
var_dump(AA::isset());
var_dump(AA::assign());
?>
--EXPECT--
int(2)
array(2) {
[0]=>
bool(true)
[1]=>
int(3)
}
int(4)
Loading