1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
  opcache_get_configuration() properly reports jit_prof_threshold
This commit is contained in:
Christoph M. Becker
2024-12-09 11:46:25 +01:00
3 changed files with 23 additions and 1 deletions

3
NEWS
View File

@@ -16,6 +16,9 @@ PHP NEWS
- Iconv:
. Fixed bug GH-17047 (UAF on iconv filter failure). (nielsdos)
- Opcache:
. opcache_get_configuration() properly reports jit_prof_threshold. (cmb)
- SimpleXML:
. Fixed bug GH-17040 (SimpleXML's unset can break DOM objects). (nielsdos)

View File

@@ -0,0 +1,19 @@
--TEST--
opcache_get_configuration() properly reports jit_prof_threshold
--EXTENSIONS--
opcache
--SKIPIF--
<?php
if (!isset(opcache_get_configuration()["directives"]["opcache.jit_prof_threshold"])) die("skip no JIT");
?>
--FILE--
<?php
$expected = 1 / 128; // needs to be exactly representable as IEEE double
ini_set("opcache.jit_prof_threshold", $expected);
$actual = opcache_get_configuration()["directives"]["opcache.jit_prof_threshold"];
var_dump($actual);
var_dump($actual === $expected);
?>
--EXPECTF--
float(0.0078125)
bool(true)

View File

@@ -860,7 +860,7 @@ ZEND_FUNCTION(opcache_get_configuration)
add_assoc_long(&directives, "opcache.jit_max_recursive_returns", JIT_G(max_recursive_returns));
add_assoc_long(&directives, "opcache.jit_max_root_traces", JIT_G(max_root_traces));
add_assoc_long(&directives, "opcache.jit_max_side_traces", JIT_G(max_side_traces));
add_assoc_long(&directives, "opcache.jit_prof_threshold", JIT_G(prof_threshold));
add_assoc_double(&directives, "opcache.jit_prof_threshold", JIT_G(prof_threshold));
add_assoc_long(&directives, "opcache.jit_max_trace_length", JIT_G(max_trace_length));
#endif