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

Fix zend_jit_class_may_be_modified() fon non linked classes

Browse Source
This commit is contained in:
Dmitry Stogov
2024-11-13 12:51:21 +03:00
parent 33ba1a4ab9
commit 3b115e6e9b
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ext/opcache/jit/zend_jit.c
View File

@@ -708,10 +708,15 @@ static bool zend_jit_class_may_be_modified(const zend_class_entry *ce, const zen
return 0;
}
if (ce->info.user.filename == called_from->filename) {
if (ce->parent && zend_jit_class_may_be_modified(ce->parent, called_from)) {
if (ce->parent
&& (!(ce->ce_flags & ZEND_ACC_LINKED)
|| zend_jit_class_may_be_modified(ce->parent, called_from))) {
return 1;
}
if (ce->num_interfaces) {
if (!(ce->ce_flags & ZEND_ACC_LINKED)) {
return 1;
}
for (i = 0; i < ce->num_interfaces; i++) {
if (zend_jit_class_may_be_modified(ce->interfaces[i], called_from)) {
return 1;
@@ -719,10 +724,14 @@ static bool zend_jit_class_may_be_modified(const zend_class_entry *ce, const zen
}
}
if (ce->num_traits) {
if (!(ce->ce_flags & ZEND_ACC_LINKED)) {
return 1;
}
for (i=0; i < ce->num_traits; i++) {
zend_class_entry *trait = zend_fetch_class_by_name(ce->trait_names[i].name,
ce->trait_names[i].lc_name, ZEND_FETCH_CLASS_TRAIT);
if (zend_jit_class_may_be_modified(trait, called_from)) {
ce->trait_names[i].lc_name,
ZEND_FETCH_CLASS_TRAIT | ZEND_FETCH_CLASS_NO_AUTOLOAD | ZEND_FETCH_CLASS_SILENT);
if (!trait || zend_jit_class_may_be_modified(trait, called_from)) {
return 1;
}
}