Skip to content

php-in-php: delete JitGetenvKernel libc defer — always JitVmHelperLink + GetenvJitHelper PHP (#1492) #20156

Description

@PurHur

Category

php-in-php · runtime-shrink (#1492, peer EnvironMirror #19157 / Bz2 #20117 / rename #20028)

Problem

lib/JIT/Builtin/StringGetenv.php still gates inventory / user-script / StreamIo-defer AOT through StreamIoRuntime::shouldDeferHeavyStreamIoEmitters()JitGetenvKernel raw libc getenv(3). Embed uses GetenvJitHelper PHP overlay (putenv-local + VmEnvEnvironNative), so thin/user-script AOT misses the overlay and duplicates libc in LLVM.

GetenvJitHelper emits as a helper-runtime unit with runtime_safe: true + init_via_global_ctor — same shape as EnvironMirrorNative / Bz2. JitVmHelperLink::ensureCompiled clears PHP_COMPILER_AOT_USER_SCRIPT during NestedJIT (#16075), so always-helper is viable.

Mode Today Target
Embed / non-defer GetenvJitHelper bridge unchanged
StreamIo defer / user-script / inventory JitGetenvKernel libc JitVmHelperLinkGetenvJitHelper
StringGetenvAll defer stub empty/minimal LLVM stub same helper path

php-src reference

PHP implementation target

  • lib/JIT/Builtin/StringGetenv.php — always JitVmHelperLink::ensureCompiled + existing out-param bridge; drop StreamIo defer / JitGetenvKernel
  • lib/JIT/Builtin/StringGetenvAll.php — drop defer inventory stub; always helper bridge
  • Delete ext/standard/JitGetenvKernel.php
  • Update test/unit/GetenvJitRuntimeShrinkTest.php + spine require list
  • Prelink prelinked/helper-runtime/*/units/ext_standard_GetenvJitHelper_php/ when emitting

Repro

./script/docker-exec.sh -- bash -lc 'source script/php-env.sh
vendor/bin/phpunit test/unit/GetenvJitRuntimeShrinkTest.php
PHP_COMPILER_AOT_USER_SCRIPT=1 ./phpc build -o /tmp/getenv_aot test/fixtures/aot/cases/getenv_putenv.phpt 2>/dev/null || true
# fixture smoke:
php -r "echo \"see AotTest getenv_putenv / getenv_local_only\";"
vendor/bin/phpunit --filter getenv test/aot/AotTest.php
make bootstrap-selfhost-vm-driver-execute-probe
'

Done when

  • JitGetenvKernel.php deleted
  • UserScriptAotDeferNestedJit / shouldDeferHeavyStreamIoEmitters removed from getenv bridge path
  • Shrink + AOT getenv fixtures green (putenv overlay visible under user-script AOT)
  • make bootstrap-selfhost-vm-driver-execute-probe green
  • PR body cites lines removed (kernel + defer gates)

Refs #1492, #19373, #19157, #20117, #9092

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    area:compilerCompiler / CFG / JITenhancementNew feature or requestimplementation-readySpec complete: repro, php-src ref, done-when — safe for workers to claimphase-0:FoundationPhase 0 – foundation & DevEx

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions