archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3'

Browse source 
* PHP-8.3:
  Avoid JIT warning with opcache.jit_buffer_size=0
This commit is contained in:
Ilija Tovilo 2023-10-18 10:49:19 +02:00
commit 81bebef3ee
No known key found for this signature in database
GPG key ID: A4F5D403F118200A
2 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/opcache/ZendAccelerator.c
View file

@ -3253,7 +3253,11 @@ static zend_result accel_post_startup(void)
|| zend_jit_startup(ZSMMG(reserved), jit_size, reattached) != SUCCESS) { || zend_jit_startup(ZSMMG(reserved), jit_size, reattached) != SUCCESS) {
JIT_G(enabled) = false; JIT_G(enabled) = false;
JIT_G(on) = false; JIT_G(on) = false;
zend_accel_error(ACCEL_LOG_WARNING, "Could not enable JIT!"); /* The JIT is implicitly disabled with opcache.jit_buffer_size=0, so we don't want to
* emit a warning here. */
if (JIT_G(buffer_size) != 0) {
zend_accel_error(ACCEL_LOG_WARNING, "Could not enable JIT!");
}
} }
} }
#endif #endif

16
ext/opcache/tests/jit_warning_with_zero_buffer.phpt Normal file
View file

@ -0,0 +1,16 @@
--TEST--
JIT should not emit warning with opcache.jit_buffer_size=0
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.jit=tracing
opcache.jit_buffer_size=0
opcache.log_verbosity_level=2
--EXTENSIONS--
opcache
--FILE--
<?php
var_dump(opcache_get_status()['jit']['enabled'] ?? false);
?>
--EXPECT--
bool(false)