Skip to content

php-in-php: drop always-on LibcExtern snprintf after NestedJIT module-local (#32092) #32093

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
Aug 18, 2026
Merged

php-in-php: drop always-on LibcExtern snprintf after NestedJIT module-local (#32092) #32093

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
9 changes: 9 additions & 0 deletions ext/standard/JitBuiltinWarning.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use PHPCompiler\JIT\Builtin\StatPathRuntime;
use PHPCompiler\JIT\Context;
use PHPCompiler\VM\ErrorReporter;
use PHPCompiler\JIT\LibcExtern;
use PHPLLVM\Builder;
use PHPLLVM\Value;

Expand Down Expand Up @@ -48,6 +49,8 @@ public static function emitImageReadFailed(Context $context, Value $sourceStr, s
$charPtr
);
$fnPtr = $context->builder->pointerCast($context->constantFromString($function), $charPtr);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$written = $context->builder->call(
$context->lookupFunction('snprintf'),
$bufChar,
Expand Down Expand Up @@ -86,6 +89,8 @@ public static function emitStreamOpenFailed(Context $context, Value $pathStr, st
$charPtr
);
$fnPtr = $context->builder->pointerCast($context->constantFromString($function), $charPtr);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$written = $context->builder->call(
$context->lookupFunction('snprintf'),
$bufChar,
Expand Down Expand Up @@ -172,6 +177,8 @@ private static function emitPathOpenDirFailedMessage(
$charPtr
);
$fnPtr = $context->builder->pointerCast($context->constantFromString($function), $charPtr);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$written = $context->builder->call(
$context->lookupFunction('snprintf'),
$bufChar,
Expand Down Expand Up @@ -209,6 +216,8 @@ public static function emitPathNoSuchFile(Context $context, Value $pathStr, stri
$charPtr
);
$fnPtr = $context->builder->pointerCast($context->constantFromString($function), $charPtr);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$written = $context->builder->call(
$context->lookupFunction('snprintf'),
$bufChar,
Expand Down
25 changes: 5 additions & 20 deletions ext/standard/JitDate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
use PHPCompiler\JIT\JitStringArg;
use PHPCompiler\JIT\JitStringBuiltinArg;
use PHPCompiler\JIT\JitValueBox;
use PHPCompiler\JIT\LibcExtern;
use PHPCompiler\JIT\ScriptMagic;
use PHPCompiler\JIT\Variable as JITVariable;
use PHPCompiler\OpCode;
Expand Down Expand Up @@ -311,7 +312,8 @@ public static function tryFormatCivilLiteral(Context $context, string $fmtLit, V
$charPtr = $context->getTypeFromString('char*');
$buf = $context->builder->alloca($i8, 24, 'u_buf');
$bufChar = $context->builder->pointerCast($buf, $charPtr);
self::ensureSnprintf($context);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$fmt = $context->builder->pointerCast($context->constantFromString('%lld'), $charPtr);
$written = $context->builder->call(
$context->lookupFunction('snprintf'),
Expand Down Expand Up @@ -369,7 +371,8 @@ public static function tryFormatCivilLiteral(Context $context, string $fmtLit, V
$charPtr = $context->getTypeFromString('char*');
$buf = $context->builder->alloca($i8, $bufSize, 'civil_buf');
$bufChar = $context->builder->pointerCast($buf, $charPtr);
self::ensureSnprintf($context);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$fmt = $context->builder->pointerCast($context->constantFromString($printfFmt), $charPtr);
$callArgs = [$bufChar, $sizeT->constInt($bufSize, false), $fmt];
foreach ($keys as $key) {
Expand All @@ -385,24 +388,6 @@ public static function tryFormatCivilLiteral(Context $context, string $fmtLit, V
);
}

private static function ensureSnprintf(Context $context): void
{
if (null === $context->module->getNamedFunction('snprintf')) {
$charPtr = $context->getTypeFromString('char*');
$sizeT = $context->getTypeFromString('size_t');
$context->module->addFunction(
'snprintf',
$context->context->functionType(
$context->getTypeFromString('int32'),
true,
$charPtr,
$sizeT,
$charPtr
)
);
}
}

public static function formatStrftime(Context $context, bool $gmt, JITVariable ...$args): Value
{
$argc = \count($args);
Expand Down
3 changes: 3 additions & 0 deletions ext/standard/JitFtok.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use PHPCompiler\JIT\JitValueBox;
use PHPCompiler\JIT\Variable as JITVariable;
use PHPCompiler\VM\ErrorReporter;
use PHPCompiler\JIT\LibcExtern;
use PHPLLVM\Builder;
use PHPLLVM\Value;

Expand Down Expand Up @@ -144,6 +145,8 @@ private static function emitFtokFailedWarning(Context $context): void
$errMsg = $context->builder->call($context->lookupFunction('strerror'), $errnoVal);
$msgSlot = BasicBlockHelper::entryAlloca($context, $i8->arrayType(256));
$msg = $context->builder->pointerCast($msgSlot, $i8p);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$context->builder->call(
$context->lookupFunction('snprintf'),
$msg,
Expand Down
2 changes: 2 additions & 0 deletions ext/standard/JitIntdiv.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,8 @@ private static function maybeEmitFloatToIntPrecisionWarning(
$fmt = $context->builder->pointerCast($context->constantFromString('%s%g%s'), $charPtr);
$prefixPtr = $context->builder->pointerCast($context->constantFromString($prefix), $charPtr);
$suffixPtr = $context->builder->pointerCast($context->constantFromString($suffix), $charPtr);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$written = $context->builder->call(
$context->lookupFunction('snprintf'),
$bufChar,
Expand Down
3 changes: 3 additions & 0 deletions ext/standard/JitMicrotimeKernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

use PHPCompiler\JIT\BasicBlockHelper;
use PHPCompiler\JIT\Context;
use PHPCompiler\JIT\LibcExtern;
use PHPLLVM\Builder;
use PHPLLVM\Value;

Expand Down Expand Up @@ -113,6 +114,8 @@ public static function invokeString(Context $context): Value
$context->constantFromString('%.8f %ld'),
$charPtr
);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$written = $context->builder->call(
$context->lookupFunction('snprintf'),
$bufChar,
Expand Down
2 changes: 2 additions & 0 deletions ext/standard/JitMultipartKernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,6 +894,8 @@ private static function emitHandlePart(
);
// size as decimal string via snprintf into small alloca
$sizeBuf = $context->builder->alloca($i8, 32, 'mp_size_'.$tag);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$context->builder->call(
$context->lookupFunction('snprintf'),
$context->builder->pointerCast($sizeBuf, $i8p),
Expand Down
20 changes: 3 additions & 17 deletions ext/standard/JitNlLanginfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public static function invokeLibcLeaf(Context $context, JITVariable $item): Valu
} else {
BasicBlockHelper::ensureOpenInsertBlock($context, 'nl_langinfo_leaf_setup');
}
self::ensureSnprintf($context);
LibcExtern::ensureSnprintf($context);
self::ensureLibcNlLanginfo($context);

$itemVal = self::jitIntArgI32($context, $item);
Expand Down Expand Up @@ -154,6 +154,8 @@ private static function emitInvalidItemWarning(Context $context, Value $itemVal)
);
$msgSlot = BasicBlockHelper::entryAlloca($context, $i8->arrayType(64));
$msg = $context->builder->pointerCast($msgSlot, $i8p);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$context->builder->call(
$context->lookupFunction('snprintf'),
$msg,
Expand Down Expand Up @@ -187,22 +189,6 @@ private static function ensureLibcNlLanginfo(Context $context): void
}
}

private static function ensureSnprintf(Context $context): void
{
$i8p = $context->getTypeFromString('int8*');
$i32 = $context->getTypeFromString('int32');
$sizeT = $context->getTypeFromString('size_t');
try {
$context->lookupFunction('snprintf');
} catch (\Throwable) {
$fn = $context->module->addFunction(
'snprintf',
$context->context->functionType($i32, true, $i8p, $sizeT, $i8p)
);
$context->registerFunction('snprintf', $fn);
}
}

private static function jitIntArgI32(Context $context, JITVariable $arg): Value
{
$i32 = $context->getTypeFromString('int32');
Expand Down
4 changes: 4 additions & 0 deletions ext/standard/JitSessionStorageKernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,8 @@ private static function emitSessionFilePathString(Context $context, Value $idLen
$context->constantFromString('%s/sess_%.*s'),
$i8p
);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$context->builder->call(
$context->lookupFunction('snprintf'),
$pathPtr,
Expand Down Expand Up @@ -651,6 +653,8 @@ private static function emitSessionWireSaveToPath(Context $context, Value $sessi
$context->constantFromString('%.*s|s:%lld:"%.*s";'),
$i8p
);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$wrote = $context->builder->call(
$context->lookupFunction('snprintf'),
$dst,
Expand Down
3 changes: 3 additions & 0 deletions ext/standard/JitStat.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
use PHPCompiler\JIT\Context;
use PHPCompiler\JIT\JitValueBox;
use PHPCompiler\VM\ErrorReporter;
use PHPCompiler\JIT\LibcExtern;
use PHPLLVM\Builder;
use PHPLLVM\Value;

Expand Down Expand Up @@ -355,6 +356,8 @@ private static function emitPathStatFailureWarning(
$fmt = $context->builder->pointerCast($context->constantFromString('%s(): %s failed for %s'), $charPtr);
$fnPtr = $context->builder->pointerCast($context->constantFromString($function), $charPtr);
$opPtr = $context->builder->pointerCast($context->constantFromString($op), $charPtr);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$written = $context->builder->call(
$context->lookupFunction('snprintf'),
$bufChar,
Expand Down
2 changes: 2 additions & 0 deletions ext/standard/JitTempnamKernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,8 @@ private static function mkstempAttempt(

$context->builder->branch($format);
$context->builder->positionAtEnd($format);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$n = $context->builder->call(
$context->lookupFunction('snprintf'),
$tpl,
Expand Down
3 changes: 3 additions & 0 deletions ext/standard/decbin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use PHPCompiler\Func\Internal;
use PHPCompiler\JIT\Context;
use PHPCompiler\JIT\Variable as JITVariable;
use PHPCompiler\JIT\LibcExtern;
use PHPLLVM\Value;

/**
Expand Down Expand Up @@ -65,6 +66,8 @@ private function formatToString(Context $context, Value $value, string $format):
$context->constantFromString($format),
$charPtr
);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$written = $context->builder->call(
$context->lookupFunction('snprintf'),
$bufChar,
Expand Down
3 changes: 3 additions & 0 deletions ext/standard/dechex.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use PHPCompiler\Func\Internal;
use PHPCompiler\JIT\Context;
use PHPCompiler\JIT\Variable as JITVariable;
use PHPCompiler\JIT\LibcExtern;
use PHPLLVM\Value;

/**
Expand Down Expand Up @@ -65,6 +66,8 @@ private function formatToString(Context $context, Value $value, string $format):
$context->constantFromString($format),
$charPtr
);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$written = $context->builder->call(
$context->lookupFunction('snprintf'),
$bufChar,
Expand Down
3 changes: 3 additions & 0 deletions ext/standard/decoct.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use PHPCompiler\Func\Internal;
use PHPCompiler\JIT\Context;
use PHPCompiler\JIT\Variable as JITVariable;
use PHPCompiler\JIT\LibcExtern;
use PHPLLVM\Value;

/**
Expand Down Expand Up @@ -65,6 +66,8 @@ private function formatToString(Context $context, Value $value, string $format):
$context->constantFromString($format),
$charPtr
);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$written = $context->builder->call(
$context->lookupFunction('snprintf'),
$bufChar,
Expand Down
3 changes: 3 additions & 0 deletions ext/standard/strval.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
use PHPCompiler\VM\ErrorReporter;
use PHPCompiler\VM\Variable;
use PHPCompiler\VM\VmResourceIdString;
use PHPCompiler\JIT\LibcExtern;
use PHPLLVM\Builder;
use PHPLLVM\Value;

Expand Down Expand Up @@ -302,6 +303,8 @@ private function formatToString(Context $context, Value $value, string $format):
$context->constantFromString($format),
$charPtr
);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$written = $context->builder->call(
$context->lookupFunction('snprintf'),
$bufChar,
Expand Down
6 changes: 6 additions & 0 deletions lib/JIT/Builtin/BackedEnumFromRuntime.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,8 @@ private static function formatStringBackingValueError(
$context->constantFromString('"%.*s" is not a valid backing value for enum %s'),
$charPtr
);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$written = $context->builder->call(
$context->lookupFunction('snprintf'),
$bufChar,
Expand Down Expand Up @@ -376,6 +378,8 @@ private static function formatIntBackingValueError(
$context->constantFromString('%lld is not a valid backing value for enum %s'),
$charPtr
);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$written = $context->builder->call(
$context->lookupFunction('snprintf'),
$bufChar,
Expand Down Expand Up @@ -500,6 +504,8 @@ private static function formatDoubleString(Context $context, Value $doubleVal):
$buf = $context->builder->call($context->lookupFunction('__mm__malloc'), $bufSize);
$bufChar = $context->builder->pointerCast($buf, $charPtr);
$fmt = $context->builder->pointerCast($context->constantFromString('%G'), $charPtr);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$written = $context->builder->call($context->lookupFunction('snprintf'), $bufChar, $bufSize, $fmt, $doubleVal);
$len = $context->builder->zExt($written, $i64);
$str = $context->builder->call($context->lookupFunction('__string__init'), $len, $bufChar);
Expand Down
2 changes: 2 additions & 0 deletions lib/JIT/Builtin/EmbedObEchoBridge.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,8 @@ public static function implementSnprintfEcho(
$fn->getParam(0)
);
} else {
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$n = $context->builder->call(
$context->lookupFunction('snprintf'),
$bufPtr,
Expand Down
3 changes: 3 additions & 0 deletions lib/JIT/Builtin/ErrorRaise.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use PHPCompiler\JIT\BasicBlockHelper;
use PHPCompiler\JIT\Builtin;
use PHPCompiler\JIT\Context;
use PHPCompiler\JIT\LibcExtern;
use PHPLLVM;

/**
Expand Down Expand Up @@ -238,6 +239,8 @@ private static function implementAbortIfPending(Context $context): void
$lineBuf = $context->builder->alloca($i8->arrayType(512), 1, 'fatal_line');
$linePtr = $context->builder->pointerCast($lineBuf, $i8p);
$stderrPtr = StringTriggerErrorJit::stderrFilePtr($context);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$context->builder->call(
$context->lookupFunction('snprintf'),
$linePtr,
Expand Down
3 changes: 3 additions & 0 deletions lib/JIT/Builtin/NumberFormatRuntime.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

use PHPCompiler\JIT\BasicBlockHelper;
use PHPCompiler\JIT\Context;
use PHPCompiler\JIT\LibcExtern;
use PHPLLVM\Builder;
use PHPLLVM\Value;
use PHPLLVM\Value\Function_ as LlvmFunction;
Expand Down Expand Up @@ -56,6 +57,8 @@ public static function emitBridgeBody(Context $context, LlvmFunction $fn, Value
$context->constantFromString('%.*f'),
$charPtr
);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$written = $context->builder->call(
$context->lookupFunction('snprintf'),
$bufChar,
Expand Down
4 changes: 4 additions & 0 deletions lib/JIT/Builtin/ObOutputEchoJitEmit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ private static function emitSnprintfAppend(Context $context, LlvmFunction $fn, s
$i32 = $context->getTypeFromString('int32');
$buf = $context->builder->alloca($i8->arrayType($bufSize), 1, 'fmtbuf');
$bufPtr = $context->builder->pointerCast($buf, $i8p);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$n = $context->builder->call(
$context->lookupFunction('snprintf'),
$bufPtr,
Expand Down Expand Up @@ -168,6 +170,8 @@ private static function emitSnprintfAppendDouble(Context $context, LlvmFunction
$i32 = $context->getTypeFromString('int32');
$buf = $context->builder->alloca($i8->arrayType($bufSize), 1, 'dblbuf');
$bufPtr = $context->builder->pointerCast($buf, $i8p);
// snprintf(3) via LibcExtern::ensureSnprintf after always-on drop (#32092).
LibcExtern::ensureSnprintf($context);
$n = $context->builder->call(
$context->lookupFunction('snprintf'),
$bufPtr,
Expand Down
Loading
Loading