Skip to content

php-in-php: drop JitEnv putenv thin libc fork — always GetenvJitHelper (#21023) #21042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PurHur merged 1 commit into from
Jul 19, 2026
Merged

php-in-php: drop JitEnv putenv thin libc fork — always GetenvJitHelper (#21023) #21042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 25 additions & 32 deletions ext/standard/JitEnv.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
declare(strict_types=1);

/**
* JIT/AOT helpers for getenv() and putenv() via GetenvJitHelper PHP (#9092, #8992, #20499).
* JIT/AOT helpers for getenv() and putenv() via GetenvJitHelper PHP (#9092, #8992, #20499, #21023).
*
* Thin standalone AOT (`isThinStandaloneAotMain`, #20443 / #20156 shape): libc setenv only —
* Nested GetenvJitHelper::putenv aborts on concat/slot temps (#17316). Embed / non-thin:
* helper overlay + libc mirror.
* Embed + thin standalone AOT: syntax guard + {@see GetenvJitHelper::putenv} overlay +
* libc setenv mirror (getenv #20644 / rename #20603 shape — no thin libc-only fork).
* Bool results are bare {@see int1} so Internal::call type inference succeeds (#21023).
* php-src: ext/standard/basic_functions.c — zif_putenv
*/

namespace PHPCompiler\ext\standard;
Expand Down Expand Up @@ -62,52 +63,46 @@ public static function putenv(Context $context, Value $assignmentStr): Value
{
BasicBlockHelper::ensureOpenInsertBlock($context, 'putenv_emit_cont');

// Thin standalone AOT: libc setenv only (#17316 / #20499). putenv_.php materializes
// via __string__separate so the setenv mirror sees a NUL-terminated buffer.
// Skip syntax guard here: first-byte/length GEPs on some concat temps still
// misfire under thin AOT even after separate (seen as SIGABRT in guard abort).
if ($context->isThinStandaloneAotMain()) {
self::emitLibcPutenvMirror($context, $assignmentStr);
$i8 = $context->getTypeFromString('int8');

return $i8->constInt(1, false);
}

// Always NestedJIT GetenvJitHelper overlay + libc mirror (#21023).
// putenv_.php materializes via __string__separate so the setenv mirror sees a
// NUL-terminated buffer.
self::emitPutenvSyntaxGuard($context, $assignmentStr);
StringGetenv::ensurePutenvLinked($context);
$result = JitNestedHelperCoerce::callHelper(
$context,
StringGetenv::helperFunction(
$context,
'PHPCompiler\\ext\\standard\\GetenvJitHelper::putenv'
'PHPCompiler\ext\standard\GetenvJitHelper::putenv'
),
[$assignmentStr]
);
self::emitLibcPutenvMirror($context, $assignmentStr);

return $result;
// Prefer bare i1 for Internal::call inference; value-box bools also work via extract.
return JitNestedHelperCoerce::extractBoolFromHelperResult($context, $result);
}

/**
* putenv from a compile-time "NAME=value" literal — avoid __string__ GEPs (#5965).
*
* Uses the same malloc+NUL+setenv path as {@see emitLibcPutenvMirror} so long values
* with CR/LF (multipart REQUEST_BODY) round-trip under thin user-script AOT.
* with CR/LF (multipart REQUEST_BODY) round-trip under user-script AOT.
* Direct setenv(nameConst, valueConst) left REQUEST_BODY empty after getenv (#5965).
* Non-thin: also NestedJIT {@see GetenvJitHelper::putenv} overlay (#20499).
* Always NestedJIT {@see GetenvJitHelper::putenv} overlay (#21023 / #20499).
*/
public static function putenvFromCStringLiteral(Context $context, string $assignment): Value
{
BasicBlockHelper::ensureOpenInsertBlock($context, 'putenv_lit_emit_cont');
LibcExtern::register($context);
$i1 = $context->getTypeFromString('int1');
$i8 = $context->getTypeFromString('int8');
$i8p = $context->getTypeFromString('int8*');
$i32 = $context->getTypeFromString('int32');
$i64 = $context->getTypeFromString('int64');
$sizeT = $context->getTypeFromString('size_t');
$eqPos = strpos($assignment, '=');
if (false === $eqPos || 0 === $eqPos) {
return $i8->constInt(0, false);
return $i1->constInt(0, false);
}

$len = strlen($assignment);
Expand Down Expand Up @@ -146,20 +141,18 @@ public static function putenvFromCStringLiteral(Context $context, string $assign
$context->builder->positionAtEnd($skip);
$context->builder->call($context->lookupFunction('free'), $cStr);

if (!$context->isThinStandaloneAotMain()) {
$str = $context->builder->load($context->constantStringFromString($assignment));
StringGetenv::ensurePutenvLinked($context);
JitNestedHelperCoerce::callHelper(
$str = $context->builder->load($context->constantStringFromString($assignment));
StringGetenv::ensurePutenvLinked($context);
JitNestedHelperCoerce::callHelper(
$context,
StringGetenv::helperFunction(
$context,
StringGetenv::helperFunction(
$context,
'PHPCompiler\\ext\\standard\\GetenvJitHelper::putenv'
),
[$str]
);
}
'PHPCompiler\ext\standard\GetenvJitHelper::putenv'
),
[$str]
);

return $i8->constInt(1, false);
return $i1->constInt(1, false);
}

public static function apacheSetenv(Context $context, Value $variableStr, Value $valueStr): Value
Expand Down
2 changes: 1 addition & 1 deletion ext/standard/putenv_.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use PHPCompiler\JIT\Variable as JITVariable;
use PHPLLVM\Value;

/** putenv() — set/unset process environment (VM; JIT/AOT via libc putenv). */
/** putenv() — set/unset process environment (VM; JIT/AOT via GetenvJitHelper + libc mirror). */
final class putenv_ extends Internal
{
public function __construct()
Expand Down
9 changes: 6 additions & 3 deletions test/unit/PutenvRuntimeShrinkTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,19 @@
use PHPUnit\Framework\TestCase;

/**
* putenv thin AOT: libc-only via isThinStandaloneAotMain; embed NestedJIT GetenvJitHelper (#20499, #20156, #20443).
* putenv: always GetenvJitHelper via NestedJIT + libc mirror — no thin libc-only fork (#21023, #20499, #20644).
*/
final class PutenvRuntimeShrinkTest extends TestCase
{
public function testJitEnvPutenvGatesThinOnIsThinStandaloneAotMain(): void
public function testJitEnvPutenvAlwaysUsesHelperOverlay(): void
{
$source = (string) file_get_contents(__DIR__.'/../../ext/standard/JitEnv.php');
$this->assertStringContainsString('isThinStandaloneAotMain', $source);
$this->assertStringContainsString('GetenvJitHelper::putenv', $source);
$this->assertStringContainsString('emitLibcPutenvMirror', $source);
$this->assertStringContainsString('emitPutenvSyntaxGuard', $source);
$this->assertStringContainsString('ensurePutenvLinked', $source);
$this->assertStringContainsString('extractBoolFromHelperResult', $source);
$this->assertStringNotContainsString('isThinStandaloneAotMain', $source);
$this->assertStringNotContainsString('shouldDeferHeavyStreamIoEmitters', $source);
$this->assertStringNotContainsString('UserScriptAotDeferNestedJit', $source);
$this->assertStringNotContainsString('StreamIoRuntime', $source);
Expand Down