php-in-php: drop isThinStandaloneAotMain libc fork from JitEnv putenv — always GetenvJitHelper + libc mirror (re-#20499)

[PurHur]

Category

php-in-php · runtime-shrink (#1492, re-#20499 / peer getenv #20644 / rename #20603)

Problem

#20499 / #20500 moved putenv thin AOT off the StreamIo defer bag onto isThinStandaloneAotMain(), but thin standalone still takes a libc-only setenv path and skips GetenvJitHelper::putenv overlay. Peer StringGetenv already always NestedJITs the PHP helper under thin AOT (#20644). Thin user-script AOT therefore diverges from embed: overlay mutations and syntax ValueError path are skipped (guard also skipped for concat-temp SIGABRT history — #17316).

Path	Today	Target
Embed / non-thin	syntax guard + GetenvJitHelper::putenv + libc mirror	unchanged
Thin standalone AOT	libc setenv only (no helper)	helper + libc mirror (same as embed); NestedJIT leaf only inside helper compile if needed
putenvFromCStringLiteral thin	libc only	also overlay helper

php-src reference

• php/php-src ext/standard/basic_functions.c — zif_putenv

PHP implementation target

• ext/standard/JitEnv.php — delete isThinStandaloneAotMain early-return in putenv() / putenvFromCStringLiteral(); always StringGetenv::ensurePutenvLinked + GetenvJitHelper::putenv + emitLibcPutenvMirror
• Keep emitLibcPutenvMirror (process environ for libc getenv readers — not C runtime growth)
• test/unit/PutenvRuntimeShrinkTest.php — Rename/Getenv shape: no isThinStandaloneAotMain in JitEnv.php
• Risk note: AOT: fix request_parse_body compile/link (#5965) #17316 concat/slot temp SIGABRT — if repro still red under thin AOT, leave precise blocker comment (do not force-merge)

Repro

./script/docker-exec.sh -- bash -lc 'source script/php-env.sh
vendor/bin/phpunit test/unit/PutenvRuntimeShrinkTest.php
vendor/bin/phpunit --filter putenv test/aot/AotTest.php
make bootstrap-selfhost-vm-driver-execute-probe
'

Done when

• isThinStandaloneAotMain gone from JitEnv.php putenv paths
• Thin + embed both use GetenvJitHelper::putenv + libc mirror
• Putenv shrink + AOT putenv fixtures green; VM driver probe green
• PR cites lines removed / no new runtime/*.c

Refs #1492, #20499, #20644, #17316, #10533

[PurHur]

claim: PHP Runtime → PHP — starting this run (drop JitEnv putenv thin libc fork; peer #20644).

[PurHur]

claim: PHP Runtime → PHP — continuing this run (prior claim abandoned without PR; branch agent/runtime-php-putenv-always-helper).

Pillar 1 at takeover: docker lock freed after prior agent exit; implementing always-helper putenv (#21023 peer #20644).

[PurHur]

Back off: prior agent still holds docker (debugging putenv_smoke / #17316). Leaving #21023 to that run — switching to next peer migration.

[PurHur]

claim: PHP Runtime → PHP — starting this run (drop JitEnv putenv thin libc fork; peer #20644).

Pillar 1 before implement

Gate	Status
docker info	green
bootstrap-inventory --check	green (OK 6048/6048 via release-readiness)
check-selfhost-spine-coverage-sync	green
north-star5-verify --fast	green
bootstrap-selfhost-vm-driver-execute-probe	green
user_release_ready	yes

Prior claims stale / no open PR; taking #21023.

[PurHur]

Back off: worktree /tmp/phpc-putenv-21023 already on agent/runtime-php-putenv-21023 — leaving #21023 to that run. Switching to next peer migration.

[PurHur]

Merged

PR: #21042 (squash)

Change: JitEnv putenv always GetenvJitHelper + libc mirror (no isThinStandaloneAotMain libc-only fork). Literal path returns bare int1.

Verification:

• PutenvRuntimeShrinkTest OK (11 assertions)
• putenv_smoke AOT → putenv ok
• bootstrap-selfhost-vm-driver-execute-probe OK