Skip to content

[pull] master from php:master#829

Merged
pull[bot] merged 4 commits intoturkdevops:masterfrom
php:master
Mar 31, 2026
Merged

[pull] master from php:master#829
pull[bot] merged 4 commits intoturkdevops:masterfrom
php:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Mar 31, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

arnaud-lb and others added 4 commits March 31, 2026 17:30
Add a missing `t->stack_map[...].reg = ZREG_NONE` in `zend_jit_snapshot_handler`.
This is needed when reg is `ZREG_NONE`, otherwise side traces will have wrong
assumptions.

Fixes GH-21158
Closes GH-21531
* PHP-8.4:
  Reset stackmap reg
* PHP-8.5:
  Reset stackmap reg
Accept a zend_string* to be able to use the zend_string_concat APIs
Make the function static as it's not exported in a header and only used inside this file
@pull pull bot locked and limited conversation to collaborators Mar 31, 2026
@pull pull bot added the ⤵️ pull label Mar 31, 2026
@pull pull bot merged commit a231da8 into turkdevops:master Mar 31, 2026
1 of 3 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants