Language: nested FUNCCALL_INIT stack restores html_entity_decode after htmlspecialchars_decode (#32064)

[PurHur]

Summary

• html_entity_decode() after htmlspecialchars_decode() in the same unit returned null (VM/JIT) instead of "é" because three stacked FUNCCALL_INITs overwrote a single pending-call slot; the later EXEC ran with call === null.
• Pending outbound call restore is now a stack on VM (Frame) and JIT (Scope), matching nested INIT/EXEC pairing (php-src ext/standard/html.c has no cross-call clobber).
• Closes Stdlib: html_entity_decode() returns null after htmlspecialchars_decode() in the same unit (ext/standard/html.c) #32064.

php-src reference

• php/php-src ext/standard/html.c — PHP_FUNCTION(html_entity_decode) / PHP_FUNCTION(htmlspecialchars_decode) are separate.

PHP implementation

• lib/VM.php / lib/Frame.php — runtime nested INIT stack
• lib/JIT.php / lib/JIT/Scope.php — compile-time nested INIT stack (MCJIT/AOT lowering)

Test plan

• Issue repro VM/JIT match Zend
• ./script/phpunit.sh test/unit/HtmlEntityDecodeAfterHsDecode32064Test.php
• ./script/phpunit.sh test/compliance/HtmlentitiesVMTest.php
• ./script/phpunit.sh test/compliance/HtmlentitiesJITTest.php

Verification

./script/docker-exec.sh -- bash -lc 'php bin/vm.php test/repro/maintainer_gap_html_entity_decode_after_hs_decode.php'
string(4) ""&<'"
string(2) "é"

./script/docker-exec.sh -- bash -lc 'php bin/jit.php test/repro/maintainer_gap_html_entity_decode_after_hs_decode.php'
string(4) ""&<'"
string(2) "é"

./script/docker-exec.sh -- bash -lc 'php test/repro/maintainer_gap_html_entity_decode_after_hs_decode.php'
string(4) ""&<'"
string(2) "é"

./script/phpunit.sh test/unit/HtmlEntityDecodeAfterHsDecode32064Test.php
OK (2 tests, 2 assertions)

./script/phpunit.sh test/compliance/HtmlentitiesVMTest.php
OK (5 tests, 5 assertions)

./script/phpunit.sh test/compliance/HtmlentitiesJITTest.php
OK (3 tests, 3 assertions)

Not covered: full ./script/ci-local.sh; native AOT of this repro still segfaults after the first var_dump (helper-runtime cache path; issue scope is VM/JIT). php script/bootstrap-inventory.php --check is stale on master (unrelated file-list drift) — not restamped.

Made with Cursor