Skip to content

Fix GH-22915: Preserve parent regs in zend_jit_deoptimizer_start() - #22916

Merged
arnaud-lb merged 5 commits into
php:PHP-8.4from
arnaud-lb:gh22915
Aug 7, 2026
Merged

Fix GH-22915: Preserve parent regs in zend_jit_deoptimizer_start()#22916
arnaud-lb merged 5 commits into
php:PHP-8.4from
arnaud-lb:gh22915

Conversation

@arnaud-lb

@arnaud-lb arnaud-lb commented Jul 29, 2026

Copy link
Copy Markdown
Member

See GH-22915.

Fix by emitting an early RLOAD for every register that will be saved later.

This was already done at the beginning of side traces, but not in "compiled exits" aka blacklisted side traces.

Should fix https://github.com/php/php-src/actions/runs/30059575887/job/89378471139#step:15:2441.

This changes opcache.jit_max_side_traces to a PHP_INI_ALL. Should be harmless and makes the test reliable.

@arnaud-lb
arnaud-lb changed the base branch from master to PHP-8.4 July 29, 2026 09:50
@arnaud-lb
arnaud-lb marked this pull request as ready for review July 29, 2026 10:24
@arnaud-lb
arnaud-lb requested a review from dstogov as a code owner July 29, 2026 10:24
@arnaud-lb
arnaud-lb requested review from LamentXU123 and iliaal August 4, 2026 16:25
Comment thread ext/opcache/tests/jit/gh22915.phpt
Comment thread ext/opcache/zend_accelerator_module.c Outdated

@iliaal iliaal left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, 2 small nits/notes up-to you if you want to address them, non-blockers imo

@arnaud-lb
arnaud-lb merged commit 905afb5 into php:PHP-8.4 Aug 7, 2026
1 of 2 checks passed
arnaud-lb added a commit that referenced this pull request Aug 7, 2026
* PHP-8.5:
  JIT: Preserve parent regs in zend_jit_deoptimizer_start() (#22916)
pull Bot pushed a commit to turkdevops/php-src that referenced this pull request Aug 7, 2026
* PHP-8.4:
  JIT: Preserve parent regs in zend_jit_deoptimizer_start() (php#22916)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants