Skip to content

Fix GH-21158: Reset stackmap reg#21531

Closed
arnaud-lb wants to merge 1 commit intophp:PHP-8.4from
arnaud-lb:gh21158
Closed

Fix GH-21158: Reset stackmap reg#21531
arnaud-lb wants to merge 1 commit intophp:PHP-8.4from
arnaud-lb:gh21158

Conversation

@arnaud-lb
Copy link
Copy Markdown
Member

@arnaud-lb arnaud-lb commented Mar 25, 2026

This adds 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.

@arnaud-lb arnaud-lb changed the title Reset stackmap reg Fix GH-GH-21158: Reset stackmap reg Mar 25, 2026
@arnaud-lb arnaud-lb marked this pull request as ready for review March 26, 2026 10:00
@arnaud-lb arnaud-lb requested a review from dstogov as a code owner March 26, 2026 10:00
Copy link
Copy Markdown
Member

@dstogov dstogov left a comment

Choose a reason for hiding this comment

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

This looks right. Thanks!

@arnaud-lb arnaud-lb changed the title Fix GH-GH-21158: Reset stackmap reg Fix GH-21158: Reset stackmap reg Mar 31, 2026
@arnaud-lb arnaud-lb closed this in 9f33bff Mar 31, 2026
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