Skip to content

php-in-php: StringCaseCompare NestedJIT → JitVmHelperLink::ensureCompiled (#23862) #23863

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 27, 2026
Merged

php-in-php: StringCaseCompare NestedJIT → JitVmHelperLink::ensureCompiled (#23862) #23863

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
45 changes: 10 additions & 35 deletions lib/JIT/Builtin/StringCaseCompare.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@

namespace PHPCompiler\JIT\Builtin;

use PHPCompiler\JIT;
use PHPCompiler\JIT\BasicBlockHelper;
use PHPCompiler\JIT\Context;
use PHPCompiler\JIT\NestedJitCompileScope;
use PHPCompiler\JIT\JitVmHelperLink;
use PHPLLVM\Builder;
use PHPLLVM\Value;
use PHPLLVM\Value\Function_ as LlvmFunction;

/**
* JIT/AOT link for strcasecmp/strncasecmp via CaseCompareJitHelper PHP (#15225).
* JIT/AOT link for strcasecmp/strncasecmp via CaseCompareJitHelper PHP (#15225, #23862).
*
* Helper compile: {@see JitVmHelperLink::ensureCompiled} (peer StringStrtotime #23832).
* Replaces libc `strcasecmp`/`strncasecmp` LLVM lookups in ext/standard. Keeps i8* ABI.
* SSOT: {@see \PHPCompiler\ext\standard\VmString}
*/
Expand Down Expand Up @@ -171,42 +171,17 @@ private static function stringFromCstr(Context $context, Value $cstr): Value
private static function helperFunction(Context $context, string $logical): LlvmFunction
{
self::ensureJitHelperCompiled($context);
$lc = \strtolower($logical);
$fn = $context->functions[$lc] ?? null;
if (null === $fn) {
throw new \LogicException($logical.' missing after CaseCompareJitHelper compile (#15225)');
}

return $fn;
return JitVmHelperLink::lookupCompiled($context, $logical, '#23862');
}

private static function ensureJitHelperCompiled(Context $context): void
{
$missing = false;
foreach (self::COMPILED_HELPERS as $logical) {
if (!isset($context->functions[\strtolower($logical)])) {
$missing = true;
break;
}
}
if (!$missing) {
return;
}

$runtime = $context->runtime;
$path = \dirname(__DIR__, 3).self::HELPER_PATH;
NestedJitCompileScope::run($context, static function () use ($context, $runtime, $path): void {
$block = $runtime->parseAndCompile((string) \file_get_contents($path), 'CaseCompareJitHelper.php');
if (null === $block) {
throw new \LogicException('CaseCompareJitHelper.php parseAndCompile failed (#15225)');
}
$jit = new JIT($context);
$jit->compile($block);
});
foreach (self::COMPILED_HELPERS as $logical) {
if (!isset($context->functions[\strtolower($logical)])) {
throw new \LogicException($logical.' was not compiled for JIT (#15225)');
}
}
JitVmHelperLink::ensureCompiled(
$context,
self::HELPER_PATH,
self::COMPILED_HELPERS,
'#23862'
);
}
}
15 changes: 14 additions & 1 deletion test/unit/StrcasecmpRuntimeShrinkTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,22 @@
use PHPCompiler\ext\standard\VmString;
use PHPUnit\Framework\TestCase;

/** strcasecmp()/strncasecmp() JIT routes through CaseCompareJitHelper PHP not libc LLVM (#15225). */
/** strcasecmp()/strncasecmp() JIT routes through CaseCompareJitHelper PHP not libc LLVM (#15225, #23862). */
final class StrcasecmpRuntimeShrinkTest extends TestCase
{
public function testStringCaseCompareUsesJitVmHelperLinkNotHandRolledNestedJit(): void
{
$source = (string) file_get_contents(__DIR__.'/../../lib/JIT/Builtin/StringCaseCompare.php');
$this->assertStringContainsString('CaseCompareJitHelper', $source);
$this->assertStringContainsString('JitVmHelperLink::ensureCompiled', $source);
$this->assertStringContainsString('JitVmHelperLink::lookupCompiled', $source);
$this->assertStringNotContainsString('NestedJitCompileScope::run', $source);
$this->assertStringNotContainsString('parseAndCompile', $source);
$this->assertStringNotContainsString('new JIT(', $source);
$this->assertStringNotContainsString('use PHPCompiler\\JIT;', $source);
$this->assertStringNotContainsString('UserScriptAotDeferNestedJit', $source);
}

public function testStrcasecmpUsesPhpBridgeNotLibcOnly(): void
{
$builtin = (string) file_get_contents(__DIR__.'/../../ext/standard/strcasecmp.php');
Expand Down