Self-host M2: rebase PR #1517 math/type batch onto master (411→426 units)

[PurHur]

Problem

M2 spine growth is at 358/586 inventory units on master. Batch 5 (+15 units → 373) is implemented in PR #1517 but CONFLICTING — rebase onto current master is blocked.

Until #1517 lands:

• 213 open m2-spine-unit issues (M2 spine: add ext/standard/SetcookieLine.php to compiler_lib_spine_smoke #1533–M2 spine: add src/yay-php8-compat.php to compiler_lib_spine_smoke #1746) cannot be batch-closed
• Self-host epic Epic: Self-host critical path — compiler compiles itself (M3→M5) #1492 M2 progress stalls
• M2 spine growth: batch tracker (compiler_lib_spine_smoke → full inventory) #1419 batch tracker shows pending batch 5

Goal

Rebase #1517, fix any new AOT lint/link failures from master drift, merge, then:

1. Update test/selfhost/compiler_lib_spine_smoke/main.php unit count in M2 spine growth: batch tracker (compiler_lib_spine_smoke → full inventory) #1419 / M2 wave 2: Grow compiler_lib_spine_smoke toward full vm.php inventory #1497
2. Close corresponding m2-spine-unit child issues included in the batch
3. Run spine gates green on Docker harness

Scope

• Rebase M2 spine wave 2 batch 5: math/type ext/standard units (#1497) #1517 only (no scope creep into batch 6 deferrals listed in M2 spine growth: batch tracker (compiler_lib_spine_smoke → full inventory) #1419)
• Document any units dropped back to deferral table (union-return, preg JitPreg, etc.)

Implementation hints

Step	Command
Lint spine	php bin/compile.php -l test/selfhost/compiler_lib_spine_smoke/main.php
Link smoke	BOOTSTRAP_LIB_SPINE_SMOKE=1 ./script/bootstrap-selfhost-lib-spine-smoke-link.sh
Next includes	php script/bootstrap-selfhost-next-includes.php --bundle=test/selfhost/compiler_lib_spine_smoke/main.php
Full gate	make bootstrap-wave-check

Verify (local / Docker only)

script/apply-patches.sh
BOOTSTRAP_LIB_SPINE_SMOKE=1 make bootstrap-selfhost-lib-spine-smoke
docker run --rm -v "$(pwd):/compiler" -w /compiler php-compiler:22.04-dev \
  bash -lc 'script/apply-patches.sh && BOOTSTRAP_LIB_SPINE_SMOKE=1 make bootstrap-selfhost-lib-spine-smoke'

No GitHub Actions.

Acceptance criteria

• PR M2 spine wave 2 batch 5: math/type ext/standard units (#1497) #1517 merged; spine count 373 on master
• bootstrap-selfhost-lib-spine-smoke green in php-compiler:22.04-dev
• M2 spine growth: batch tracker (compiler_lib_spine_smoke → full inventory) #1419 batch table updated

Dependencies

• M2 spine growth: batch tracker (compiler_lib_spine_smoke → full inventory) #1419 batch tracker
• Epic: Self-host critical path — compiler compiles itself (M3→M5) #1492 self-host epic
• M2 spine: bundle src/cli.php entry shim (#1432 follow-up) #1467 union-return deferrals (may exclude some units from batch 5)

Links

• North Star 2 🔄 North Star 2: Compiler fully compiles itself (living tracker) #1056, M2 wave 2: Grow compiler_lib_spine_smoke toward full vm.php inventory #1497 per-file index
• ROADMAP 🗺️ ROADMAP: Self-host + web-capable PHP subset (living) #78 Phase 5 Self-host

[PurHur]

PM update (batch 64, 2026-05-24)

Master baseline changed: spine is now 411/4/586 (~70%), not 358.

Recent merges superseded the PR's doc baseline but not its 15 math/type units:

• M2 spine: ext/standard string-format wrappers (358→408) #1748 (358→408 string-format), M2 spine: add preg_replace.php to compiler_lib_spine_smoke (#1658) #1749 (preg_replace), M2 spine: add src/llvm-env.php to compiler_lib_spine_smoke (#1743) #1754 (llvm-env), M2 spine: add web_int.php to compiler_lib_spine_smoke (#1738) #1756 (web_int)

Revised acceptance criteria

• PR M2 spine wave 2 batch 5: math/type ext/standard units (#1497) #1517 rebased onto current master (411 units)
• Spine count 426 after merge (411 + 15)
• Close per-file issues M2 spine: add ext/standard/boolval.php to compiler_lib_spine_smoke #1553–M2 spine: add ext/standard/decoct.php to compiler_lib_spine_smoke #1567
• bootstrap-selfhost-lib-spine-smoke green in Docker

Blocker: CONFLICTING — needs manual rebase (implementation). PR comment updated with file-level resolution table.

[PurHur]

*(Correction: master spine is 411/586, not 411/4/586.)