Skip to content

[pull] master from php:master#642

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

[pull] master from php:master#642
pull[bot] merged 4 commits intoConnectionMaster:masterfrom
php:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull Bot commented Mar 31, 2026 •
edited
Loading

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
@arnaud-lb
Reset stackmap reg
9f33bff 
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
@arnaud-lb
Merge branch 'PHP-8.4' into PHP-8.5
62add25 
* PHP-8.4:
  Reset stackmap reg
@arnaud-lb
Merge branch 'PHP-8.5'
bd042a5 
* PHP-8.5:
  Reset stackmap reg
@Girgias
sapi/phpdbg: refactor phpdbg_load_module_or_extension() (#21578)
a231da8 
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 ConnectionMaster:master Mar 31, 2026
1 check passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

⤵️ pull

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@arnaud-lb @Girgias