php-in-php: delete ParseStrUserScriptDelimitedJit — route user-script refresh through ParseStrNativeJitHelper (#18643 follow-up)

[PurHur]

Category

php-in-php · runtime-shrink (#1492, re-#18643)

Problem

lib/JIT/Builtin/ParseStrUserScriptDelimitedJit.php (~1020 LLVM lines) hand-lowers delimited parse_str for user-script AOT superglobal refresh. #18643/#18645 deleted it; #18841 restored LLVM because refresh called __phpc_parse_str_parse_delimited_pairs on raw C strings.

ParseStrNativeJitHelper::parseDelimitedIntoNative is the PHP SSOT; ParseStrRuntime::ensureUserScriptLinked() already bridges __compiler_parse_str / __compiler_parse_cookie_header to that helper. SuperglobalRefreshUserScriptLlvm should convert libc C strings to __string__* via existing cstrToPhpcString() and call those bridges — not emit/link hand-LLVM subhelpers.

php-src reference

• php/php-src ext/standard/basic_functions.c — PHP_FUNCTION(parse_str)

PHP implementation target

• lib/JIT/Builtin/SuperglobalRefreshUserScriptLlvm.php — route form/cookie parse through __compiler_parse_str / __compiler_parse_cookie_header
• Delete lib/JIT/Builtin/ParseStrUserScriptDelimitedJit.php (~1020 LOC LLVM removed)
• Update shrink guards in ParseStrRuntimeShrinkTest, SuperglobalRefreshRuntimeShrinkTest, SuperglobalsBracketRuntimeStandaloneTest

Repro

wc -l lib/JIT/Builtin/ParseStrUserScriptDelimitedJit.php  # ~1020 today
./script/docker-exec.sh -- bash -lc 'source script/php-env.sh && vendor/bin/phpunit test/unit/ParseStrRuntimeShrinkTest.php test/aot/NestedSuperglobalsAotTest.php'
./script/check-aot-build-smoke.sh

Done when

• ParseStrUserScriptDelimitedJit.php deleted; no __phpc_parse_str_* LLVM symbols linked for refresh
• NestedSuperglobalsAotTest + AOT smoke green (QUERY_STRING flat + nested keys)
• make bootstrap-selfhost-vm-driver-execute-probe green

Related

• php-in-php: re-delete ParseStrUserScriptDelimitedJit — MultipartRuntime PHP makes #18548 LLVM restore obsolete (#1492) #18643 / Fix AOT CGI superglobal refresh: QUERY_STRING populates $_GET (closes #18832) #18841 / php-in-php: delete ParseStrUserScriptDelimitedJit — user-script AOT via ParseStrJitHelper PHP not ~1053-line hand-LLVM (#1492) #14217 / Epic: Self-host critical path — compiler compiles itself (M3→M5) #1492

[PurHur]

claim: PHP Runtime → PHP — starting this run.

[PurHur]

WIP / blocker update — preparatory PR pushed; full delimited JIT deletion still blocked.

Landed (PR incoming)

• Nested JIT env unset in JitVmHelperLink during user-script AOT helper compile (Fix AOT CGI superglobal refresh: QUERY_STRING populates $_GET (closes #18832) #18841 stub fix)
• StringParseStr routes user-script standalone init → ParseStrRuntime::ensureUserScriptLinked
• ParseStrRuntime clears deferred stub bodies; bridge uses alloca + callHelper for dest i64

Blocker for deleting ParseStrUserScriptDelimitedJit.php

Routing refresh through ParseStrNativeJitHelper::parseIntoNative (direct LLVM call or __compiler_parse_str) compiles and links, but runtime $_GET is empty (NestedSuperglobalsAotTest).

Root cause (disassembly): LLVM bridges into nested parseIntoNative do not emit ptrtoint(ht); call uses stack pointer in rdi + ht in rsi + encoded in rdx. Helper entry initializes destPtr=0 and early-returns. Master’s __phpc_parse_str_parse_delimited_pairs hand-LLVM path still works.

Verification (green on branch, delimited JIT retained)

./script/docker-exec.sh -- bash -lc 'source script/php-env.sh && vendor/bin/phpunit test/aot/NestedSuperglobalsAotTest.php test/unit/ParseStrRuntimeShrinkTest.php test/unit/JIT/SuperglobalsBracketRuntimeStandaloneTest.php'
make bootstrap-selfhost-vm-driver-execute-probe

Next run

Fix external LLVM → nested JIT int $destPtr ABI, then re-apply SuperglobalRefreshUserScriptLlvm routing through PHP helper and delete delimited JIT (~1020 LLVM lines).

[PurHur]

claim: PHP Runtime → PHP — starting this run.

[PurHur]

claim: cursor-agent-lane-a — continuing PHP Runtime handoff; fixing nested JIT int $destPtr ABI so refresh can route through ParseStrNativeJitHelper and delete delimited JIT.

[PurHur]

WIP handoff — LLVM deleted, AOT repro still red

Branch: agent/issue-18855-delete-parse-str-delimited-jit (90cd62d)

Done this run

• Deleted lib/JIT/Builtin/ParseStrUserScriptDelimitedJit.php (~1050 LOC LLVM removed)
• SuperglobalRefreshUserScriptLlvm routes form/cookie parse through cstrToPhpcString() → __compiler_parse_str / __compiler_parse_cookie_header
• ParseStrRuntime bridges rewritten: register-save before materialization, __string__separate, parse_str_native_bridge_work_v3 (invalidates stale _bridge_work bodies)
• Shrink guards updated; spine require removed; bootstrap-inventory.md regenerated

Verification (green)

vendor/bin/phpunit test/unit/ParseStrRuntimeShrinkTest.php test/unit/SuperglobalRefreshRuntimeShrinkTest.php test/unit/JIT/SuperglobalsBracketRuntimeStandaloneTest.php
# OK (15 tests)

make bootstrap-selfhost-vm-driver-execute-probe
# OK

Blocker (red)

vendor/bin/phpunit test/aot/NestedSuperglobalsAotTest.php
# Expected 'ok\n', got empty (QUERY_STRING=user[name]=Ada&flat=ok)

Root cause (investigated): ParseStrNativeJitHelper::parseIntoNative is linked and called from __superglobals__refresh (disasm: rsi=ht, rdx=encoded after __string__separate), but sg_GET stays empty. Master passes via __phpc_parse_str_parse_delimited_pairs LLVM instead. Same gap as #18645 before #18841 restored LLVM — the PHP bridge path was never AOT-green for refresh.

Next step: fix __compiler_parse_str → parseIntoNative native ABI so hashtable writes land on sg_GET (compare with working __phpc_parse_str_set_string_key LLVM path / ParseStrNativeOpsJit::setStringKey). Then re-run NestedSuperglobalsAotTest + RuntimeSuperglobalRefreshTest::testTwoRequestsDifferentPostBody.

[PurHur]

claim: cursor-agent-lane-a — continuing nested JIT int $destPtr ABI fix for refresh routing (#18855).

[PurHur]

claim: cursor-agent-lane-c — continuing #18872 blocker: fix parseIntoNative bridge ABI so sg_GET populates in AOT refresh.

[PurHur]

Blocker update (cursor-agent-lane-a) — deletion path still red; precise root cause identified.

What works on master

• NestedSuperglobalsAotTest green via ParseStrUserScriptDelimitedJit / __phpc_parse_str_parse_delimited_pairs (C-string path).
• AOT parse_str('literal', $g) green (compile-time materializer bypasses __compiler_parse_str).
• AOT $s='literal'; parse_str($s,$g) green (runtime PHP-assigned string + user-script bridge).

What fails (same on master — not introduced by deletion)

• AOT parse_str($_SERVER['QUERY_STRING'], $g) → empty $g (echo of QS string shows correct bytes).
• AOT refresh via cstrToPhpcString → __compiler_parse_str → ParseStrNativeJitHelper::parseIntoNative → empty $_GET (build/sg-debug.php: QS in SERVER, flat=missing).

LLVM IR (user-script bridge)

Bridge emits correct 2-arg call when using direct builder->call + ptrtoint:

%3 = ptrtoint %__hashtable__* %0 to i64
%6 = call %__value__ @...parseintonative(i64 %3, %__string__* %1)

Helper is compiled with return type %__value__ despite PHP : void (functionReturnType = __value__).

Failed experiments this run

• callHelper + alloca dest materialization (prep php-in-php: prep ParseStrNative refresh path (toward #18855) #18863): IR ok, runtime still empty.
• callVoidNativeParseHelper bitCast to void(i64,str): compile crash (Builder::call expects Function_, got Value) and 3-arg sret call in IR.
• ParseStrNativeJitHelper delegate to ParseStrEngine::parseDelimited: AOT compile segfault after init (nested engine too heavy for user-script init).
• Removing '' === $encoded guard: no change.

Next run (recommended)

1. Fix nested-JIT runtime string ABI for explode/string ops on __string__* from __string__init / superglobal reads (AOT-only; VM green).
2. Or emit thin cstr bridge __compiler_parse_str_cstr(ht*, i8*) that keeps PHP SSOT but avoids broken __string__* operand class (still delete ~1020-line delimited JIT).
3. Optionally fix void nested-helper return typing so helpers compile as void not %__value__.

Reverted local deletion WIP to keep master green; no PR merged this run.

[PurHur]

Blocker update (lane C, continued #18855 / PR #18872)

Repro still red

./script/docker-exec.sh -- bash -lc 'source script/php-env.sh && vendor/bin/phpunit test/aot/NestedSuperglobalsAotTest.php'
# expected ok\n, got empty (QUERY_STRING=user[name]=Ada&flat=ok)

Root cause isolated

Routing SuperglobalRefreshUserScriptLlvm through cstrToPhpcString() → __compiler_parse_str is not a bridge-IR bug alone:

1. On master, swapping only the refresh routing to __compiler_parse_str (keeping delimited LLVM file present but unused) also fails the same AOT repro. Master passes today only because refresh still calls hand-LLVM __phpc_parse_str_parse_delimited_pairs on raw libc cstr.
2. __compiler_parse_str + ParseStrNativeJitHelper does work when invoked from user $this->main (e.g. parse_str($s, $_GET) → count>0), but does not populate sg_GET when called from inside __superglobals__refresh (diagnostic: count($_GET)==0 before any user code; before=0 in a two-phase script).
3. Control experiment (in refresh LLVM): direct __hashtable__setStringKeyString($getHt, 'flat', 'ok') immediately after __compiler_parse_str makes NestedSuperglobalsAotTest green — so sg_GET storage and $_GET reads are fine; the nested PHP helper path is the no-op.
4. Not fixed by: __string__separate after __string__init, compile-time constant QUERY_STRING in refresh, PHP_COMPILER_HELPER_RUNTIME_O=0, reverting bridge to callHelper, or ParseStrNativeOpsJit direct inttoptr.

Likely next fix

Investigate why phpcompiler_ext_standard_parsestrnativejithelper__parseintonative invoked from __superglobals__refresh returns without materializing native hashtable entries (ABI/early-return/explode path), while the same symbol works from user main. Alternatives:

• Emit QUERY_STRING parse from standalone_main after refresh returns (prototype hung compile — needs builder discipline), or
• Move minimal delimited LLVM into ParseStrRuntime under __compiler_* symbols (shrinks separate file but not full PHP-in-PHP), until nested-helper invocation from refresh is fixed.

PR #18872 remains open; merge blocked on green NestedSuperglobalsAotTest.

[PurHur]

claim: cursor-agent-lane-a — shipping cstr bridge via __compiler_parse_str (#18855)