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

Merge branch 'PHP-8.4'

Browse Source 
* PHP-8.4:
  Handle references after FETCH_OBJ_R with REG destination
This commit is contained in:
Arnaud Le Blanc
2025-09-22 17:57:08 +02:00
parent 1aafd3e4eb 32c919b474
commit f0878c8e30
4 changed files with 80 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -48,6 +48,7 @@ PHP NEWS
- Opcache:
. Fixed bug GH-19669 (assertion failure in zend_jit_trace_type_to_info_ex).
(Arnaud)
. Fixed bug GH-19831 (function JIT may not deref property value). (Arnaud)
- MBstring:
. Updated Unicode data tables to Unicode 17.0. (Yuya Hamada)

9
ext/opcache/jit/zend_jit_helpers.c
View File

@@ -2119,8 +2119,13 @@ static zval* ZEND_FASTCALL zend_jit_fetch_obj_r_slow_ex(zend_object *zobj)
void **cache_slot = CACHE_ADDR(opline->extended_value & ~ZEND_FETCH_OBJ_FLAGS);
retval = zobj->handlers->read_property(zobj, name, BP_VAR_R, cache_slot, result);
if (retval == result && UNEXPECTED(Z_ISREF_P(retval))) {
zend_unwrap_reference(retval);
if (UNEXPECTED(Z_ISREF_P(retval))) {
if (retval == result) {
zend_unwrap_reference(retval);
} else {
retval = Z_REFVAL_P(retval);
}
ZEND_ASSERT(!Z_REFCOUNTED_P(retval));
}
return retval;
}

33
ext/opcache/tests/jit/gh19831_001.phpt Normal file
View File

@@ -0,0 +1,33 @@
--TEST--
GH-19831 001: fetch obj slow R REG + reference
--CREDITS--
dktapps
--ENV--
RT_COND=1
--INI--
opcache.jit=1203
--FILE--
<?php
if (getenv('RT_COND')) {
class Base {
}
}
// Class is not linked
class Test extends Base {
public int $layers = 1;
public function getLayers(): int {
// Prop info is not known, but res_addr is REG
return $this->layers;
}
}
$t = new Test();
$a = &$t->layers;
var_dump($t->getLayers());
?>
--EXPECT--
int(1)

39
ext/opcache/tests/jit/gh19831_002.phpt Normal file
View File

@@ -0,0 +1,39 @@
--TEST--
GH-19831 002: fetch obj slow R REG + __get + reference
--CREDITS--
dktapps
--ENV--
RT_COND=1
--INI--
opcache.jit=1203
--FILE--
<?php
if (getenv('RT_COND')) {
class Base {
}
}
// Class is not linked
class Test extends Base {
public int $layers = 1;
public function &__get($name) {
global $a;
$a = 1;
return $a;
}
public function getLayers(): int {
// Prop info is not known, but res_addr is REG
return $this->layers;
}
}
$t = new Test();
unset($t->layers);
var_dump($t->getLayers());
?>
--EXPECT--
int(1)