diff options
| author | jvoisin | 2026-05-10 01:01:43 +0200 |
|---|---|---|
| committer | jvoisin | 2026-05-10 01:01:43 +0200 |
| commit | 5f754c32df4bd8643d62babf6f805defe59c8c92 (patch) | |
| tree | 6fdc236f5ded2320ba004118e6fcbf43ea84c91c /src/tests/disable_function | |
| parent | 0cc8e708ebbff02abe7e3c2d0dc0660585ccd98c (diff) | |
Prevent opcache from inlining functions with return-value rules on PHP 8.5+optim85
PHP 8.5's opcache optimizer can inline trivial user functions (constant
return values), completely eliminating the DO_UCALL opcode. When this
happens, zend_execute_ex is never invoked and snuffleupagus's
return-value monitoring hooks never fire.
Fix this by setting ZEND_ACC_HAS_TYPE_HINTS on monitored functions'
op_arrays during compilation (via sp_op_array_handler). This flag is
checked by opcache's zend_try_inline_call() and prevents inlining.
For 0-arg functions — the only ones eligible for inlining — there are
no RECV opcodes, so the runtime impact is zero.
To enable sp_op_array_handler when return-value rules are configured,
the extension now registers itself as a zend extension and sets
ZEND_COMPILE_HANDLE_OP_ARRAY (previously only done for global_strict).
The disabled_function_echo_2 test is updated to use separate echo
statements and opcache.optimization_level=0, since opcache's echo
merging is a compile-time string concatenation that cannot be prevented
per-function.
This is a bit ugly, but it's the less awful solution to be able to hook return
values.
Diffstat (limited to 'src/tests/disable_function')
| -rw-r--r-- | src/tests/disable_function/disabled_function_echo_2.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tests/disable_function/disabled_function_echo_2.phpt b/src/tests/disable_function/disabled_function_echo_2.phpt index e519ec4..ce3488e 100644 --- a/src/tests/disable_function/disabled_function_echo_2.phpt +++ b/src/tests/disable_function/disabled_function_echo_2.phpt | |||
| @@ -2,9 +2,9 @@ | |||
| 2 | Echo hooking | 2 | Echo hooking |
| 3 | --SKIPIF-- | 3 | --SKIPIF-- |
| 4 | <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?> | 4 | <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?> |
| 5 | <?php if (PHP_VERSION_ID >= 80500) print "skip"; ?> | ||
| 6 | --INI-- | 5 | --INI-- |
| 7 | sp.configuration_file={PWD}/config/disabled_function_echo.ini | 6 | sp.configuration_file={PWD}/config/disabled_function_echo.ini |
| 7 | opcache.optimization_level=0 | ||
| 8 | --FILE-- | 8 | --FILE-- |
| 9 | <?php | 9 | <?php |
| 10 | echo "qwe"; | 10 | echo "qwe"; |
