@@ -198,7 +198,7 @@ Overall progress
Strong on VM and AOT linking; wave-3 language **12/12** and stdlib **13/13** on master; local/Docker CI while remote GHA/Circle are disabled.
- North star M0βM1 done, M2 spine link (606/611, #1960), M3 HelloWorld strict (#1493); M5 full self-compile is the stretch goal ([#1492](https://github.com/PurHur/php-compiler/issues/1492)).
+ North star M0βM1 done, M2 spine link (609/611, #1960), M3 HelloWorld strict (#1493); M5 full self-compile is the stretch goal ([#1492](https://github.com/PurHur/php-compiler/issues/1492)).
Example web gates (make north-star1-verify, 005-SessionsWeb opt-in #1891/#1893) stay in CI as regression only.
@@ -244,7 +244,7 @@ Example polish
Self-host
Compile-itself
- M0βM1 β
; M2 spine 606/611 link β
; M3 HelloWorld strict β
; compile-smoke π§; M5 = full self-host.
+ M0βM1 β
; M2 spine 609/611 link β
; M3 HelloWorld strict β
; compile-smoke π§; M5 = full self-host.
@@ -254,7 +254,7 @@ Compile-itself
Self-host bootstrap
Stretch goal: the compiler fully compiles itself (M5). Zend still runs
- bin/compile.php today; native output is a growing lib/ bundle (~109 minimal β 606 spine units toward 611 vm.php-path files).
+ bin/compile.php today; native output is a growing lib/ bundle (~109 minimal β 609 spine units toward 611 vm.php-path files).
Full ladder: development-status.md
Β· self-host-target.md
Β· tracker #1492.
@@ -273,7 +273,7 @@
M1 β Compiler-shaped bundle
β
M2 β Full top-level lib/
- 14/14 lint β
; 606/611 spine units native link β
([#1960](https://github.com/PurHur/php-compiler/issues/1960), [#1419](https://github.com/PurHur/php-compiler/issues/1419)).
+ 14/14 lint β
; 609/611 spine units native link β
([#1960](https://github.com/PurHur/php-compiler/issues/1960), [#1419](https://github.com/PurHur/php-compiler/issues/1419)).
3
diff --git a/docs/roadmap-wave3.md b/docs/roadmap-wave3.md
index 22bf949368c..15ea405cbe8 100644
--- a/docs/roadmap-wave3.md
+++ b/docs/roadmap-wave3.md
@@ -19,7 +19,7 @@ Regenerate capability truth: `php script/capability-matrix.php`, `php script/cap
Related merges outside this wave: `goto` ([#1228](https://github.com/PurHur/php-compiler/issues/1228) / [#1333](https://github.com/PurHur/php-compiler/pull/1333)), anonymous classes ([#1233](https://github.com/PurHur/php-compiler/issues/1233) / [#1386](https://github.com/PurHur/php-compiler/pull/1386)).
-**M2 spine:** **606** / **611** inventory (`compiler_lib_spine_smoke` native link β
; 5 deferred native-link [#1960](https://github.com/PurHur/php-compiler/issues/1960), [#2066](https://github.com/PurHur/php-compiler/issues/2066); [#1492](https://github.com/PurHur/php-compiler/issues/1492), M2 batches [#1419](https://github.com/PurHur/php-compiler/issues/1419), [#1497](https://github.com/PurHur/php-compiler/issues/1497)). Target doc: [self-host-target.md](self-host-target.md)
+**M2 spine:** **609** / **611** inventory (`compiler_lib_spine_smoke` native link β
; 2 deferred native-link [#2126](https://github.com/PurHur/php-compiler/issues/2126); [#1492](https://github.com/PurHur/php-compiler/issues/1492), M2 batches [#1419](https://github.com/PurHur/php-compiler/issues/1419), [#1497](https://github.com/PurHur/php-compiler/issues/1497)). Target doc: [self-host-target.md](self-host-target.md)
## Language (#1354β#1366)
diff --git a/docs/self-host-target.md b/docs/self-host-target.md
index 95a0e8086cc..06233474243 100644
--- a/docs/self-host-target.md
+++ b/docs/self-host-target.md
@@ -34,8 +34,8 @@ That is **M5**. Everything below is the honest path from todayβs bootstrap to
| Layer | Today | Target |
|-------|-------|--------|
| **Bootstrap driver** | Zend runs `php bin/compile.php` | Compiled `bin/compile.php` |
-| **Bundle size** | **606** curated `require_once` in spine smoke (108 minimal overlap + **495** M2-only) | **611** inventory files |
-| **Inventory coverage** | **100%** of vm.php path in spine smoke (**606/611**; 5 deferred) | **100%*
+| **Bundle size** | **609** curated `require_once` in spine smoke (108 minimal overlap + **498** M2-only) | **611** inventory files |
+| **Inventory coverage** | **100%** of vm.php path in spine smoke (**609/611**; 2 deferred) | **100%*
| **HelloWorld** | Native **run** β
; **emit** still Zend fallback | Native compile + emit |
| **Bootstrap loop (M4)** | Gen-1 link + gen-2 Zend partial | Native gen-2 emit + full tree rebuild |
| **Vendor** | `composer install` + patches on host | Prelinked artifacts only |
@@ -62,7 +62,7 @@ That is **M5**. Everything below is the honest path from todayβs bootstrap to
|-----------|----------------|--------|-----|
| **M0** | AOT can link a **small** honest `lib/` subset | β
| 100% |
| **M1** | Bundle is **compiler-shaped** (lint + compile-smoke) | β
| 100% |
-| **M2** | Spine grows toward full `bin/vm.php` inventory | π§ **606/611** units | **100%*
+| **M2** | Spine grows toward full `bin/vm.php` inventory | π§ **609/611** units | **100%*
| **M3** | Self-host binary **compiles external PHP** (HelloWorld) without Zend emit | π§ partial | **~45%** |
| **M4** | Self-host binary **rebuilds** the next compiler tree | β¬ | 0% |
| **M5** | Full self-host; Zend retired from loop | β¬ north star | 0% |
@@ -73,7 +73,7 @@ That is **M5**. Everything below is the honest path from todayβs bootstrap to
| Indicator | Formula | May 2026 |
|-----------|---------|----------|
-| **M2 spine progress** | `require_once` units in `compiler_lib_spine_smoke` Γ· Phase A inventory file count | **606 / 611** (5 deferred [#2066](https://github.com/PurHur/php-compiler/issues/2066))
+| **M2 spine progress** | `require_once` units in `compiler_lib_spine_smoke` Γ· Phase A inventory file count | **609 / 611** (2 deferred [#2126](https://github.com/PurHur/php-compiler/issues/2126))
| **Public βSelf-hostβ row** | Same M2 ratio until M3βM5 gates add weight ([`development-status.md`](pages/development-status.md)) | **~61%** |
| **Composite (internal)** | Milestone weights in table above (M0βM1 = 100%, M2 = spine %, M3βM5 = gate %) | **~54%** |
@@ -125,7 +125,7 @@ Parallel batches ([#1419](https://github.com/PurHur/php-compiler/issues/1419), [
| Entry | Units | Role |
|-------|------:|------|
| `test/selfhost/compiler_minimal/main.php` | **109** | M0 core |
-| `test/selfhost/compiler_lib_spine_smoke/main.php` | **606** | M2 growth (ext/standard + Vm* spine batch
+| `test/selfhost/compiler_lib_spine_smoke/main.php` | **609** | M2 growth (ext/standard + Vm* spine batch
| `test/selfhost/compiler_helloworld_smoke/` | β | M3 probe + compile driver |
| `test/selfhost/bootstrap_loop_smoke/` | β | M4 scaffold (gen-1βgen-2 loop probe; [#1498](https://github.com/PurHur/php-compiler/issues/1498)) |
diff --git a/lib/JIT/RuntimeInitVmContext.php b/lib/JIT/RuntimeInitVmContext.php
index 9ea818d53ca..ec6d975de10 100644
--- a/lib/JIT/RuntimeInitVmContext.php
+++ b/lib/JIT/RuntimeInitVmContext.php
@@ -7,6 +7,19 @@ final class RuntimeInitVmContext {
public static function emit(Context $context, ObjectType $object, Value $runtimeThis): void {
$ctxId = $object->lookup('PHPCompiler\\VM\\Context');
$ctx = $object->allocate($ctxId);
+
+ $errorsId = $object->lookup('PHPCompiler\\VM\\ErrorReporter');
+ $errors = $object->allocate($errorsId);
+ $errorsVar = new Variable($context, Variable::TYPE_OBJECT, Variable::KIND_VALUE, $errors);
+ $errorsSlot = $object->propertyFetch($ctx, 'PHPCompiler\\VM\\Context', 'errors');
+ $object->propertyStore($errorsSlot->objectPropertySlot, $errorsVar, Variable::TYPE_OBJECT);
+
+ $stackId = $object->lookup('PHPCompiler\\VM\\ScriptStack');
+ $scriptStack = $object->allocate($stackId);
+ $stackVar = new Variable($context, Variable::TYPE_OBJECT, Variable::KIND_VALUE, $scriptStack);
+ $stackSlot = $object->propertyFetch($ctx, 'PHPCompiler\\VM\\Context', 'scriptStack');
+ $object->propertyStore($stackSlot->objectPropertySlot, $stackVar, Variable::TYPE_OBJECT);
+
$runtimeVar = new Variable($context, Variable::TYPE_OBJECT, Variable::KIND_VALUE, $runtimeThis);
$runtimeSlot = $object->propertyFetch($ctx, 'PHPCompiler\\VM\\Context', 'runtime');
$object->propertyStore($runtimeSlot->objectPropertySlot, $runtimeVar, Variable::TYPE_OBJECT);
diff --git a/script/check-selfhost-spine-coverage-sync.php b/script/check-selfhost-spine-coverage-sync.php
index 1118bfeae79..4312ddf53c3 100644
--- a/script/check-selfhost-spine-coverage-sync.php
+++ b/script/check-selfhost-spine-coverage-sync.php
@@ -36,6 +36,8 @@
'bin/vm.php' => 'test/bootstrap-aot/vm_run_smoke.php',
'src/cli.php' => 'test/bootstrap-aot/cli_spine_shim.php',
'src/cli_driver.php' => 'test/bootstrap-aot/cli_spine_shim.php',
+ 'src/llvm-env.php' => 'test/bootstrap-aot/llvm_env_spine_shim.php',
+ 'src/macro_functions.php' => 'test/bootstrap-aot/macro_functions_spine_shim.php',
];
/**
@@ -45,9 +47,6 @@
$spineNativeLinkDeferred = [
'bin/vm.php',
'lib/AOT/Linker.php',
- 'src/llvm-env.php',
- 'src/macro_functions.php',
- 'src/yay-php8-compat.php',
];
/** Inventory paths not yet in spine (regenerated inventory ahead of bundle β #1922). */
diff --git a/test/bootstrap-aot/llvm_env_spine_shim.php b/test/bootstrap-aot/llvm_env_spine_shim.php
new file mode 100644
index 00000000000..91e4d3a4503
--- /dev/null
+++ b/test/bootstrap-aot/llvm_env_spine_shim.php
@@ -0,0 +1,19 @@
+ $names
+ */
+ function php_compiler_preload_llvm_deps(string $dir, array $names): void
+ {
+ }
+}
diff --git a/test/bootstrap-aot/macro_functions_spine_shim.php b/test/bootstrap-aot/macro_functions_spine_shim.php
new file mode 100644
index 00000000000..de585beccb9
--- /dev/null
+++ b/test/bootstrap-aot/macro_functions_spine_shim.php
@@ -0,0 +1,19 @@
+assertFileExists($entry);
$contents = (string) file_get_contents($entry);
$count = substr_count($contents, 'require_once __DIR__');
- $this->assertSame(606, $count, 'M2 spine 606/611 inventory (5 deferred native-link #2066)');
+ $this->assertSame(609, $count, 'M2 spine 609/611 inventory (2 deferred native-link #2126)');
foreach (self::LIB_SPINE_SMOKE_NEW_UNITS as $unit) {
$this->assertStringContainsString(
"require_once __DIR__.'/../../../{$unit}';",
diff --git a/test/unit/BootstrapSelfhostHelloWorldTest.php b/test/unit/BootstrapSelfhostHelloWorldTest.php
index 2499f4bbfde..f8a3d68f001 100644
--- a/test/unit/BootstrapSelfhostHelloWorldTest.php
+++ b/test/unit/BootstrapSelfhostHelloWorldTest.php
@@ -354,7 +354,7 @@ public function testExternalJitClassRegistersIdToName(): void
$this->assertStringContainsString(
'$this->classIdToName[$id] = $lcname;',
$source,
- 'registerExternalClass must populate classIdToName for RuntimeInitVmContext propertyFetch (#1514)'
+ 'registerExternalClass must populate classIdToName for RuntimeInitVmContext propertyFetch (#1514, #2126)'
);
}
diff --git a/test/unit/RuntimeInitVmContextTest.php b/test/unit/RuntimeInitVmContextTest.php
new file mode 100644
index 00000000000..a70f467a482
--- /dev/null
+++ b/test/unit/RuntimeInitVmContextTest.php
@@ -0,0 +1,26 @@
+assertStringContainsString('ErrorReporter', $source);
+ $this->assertStringContainsString('ScriptStack', $source);
+ $this->assertStringContainsString("'errors'", $source);
+ $this->assertStringContainsString("'scriptStack'", $source);
+ }
+
+ public function testSpineShimsExist(): void
+ {
+ $root = dirname(__DIR__, 2);
+ $this->assertFileExists($root.'/test/bootstrap-aot/llvm_env_spine_shim.php');
+ $this->assertFileExists($root.'/test/bootstrap-aot/macro_functions_spine_shim.php');
+ }
+}
diff --git a/test/unit/SelfhostSpineSubstitutesTest.php b/test/unit/SelfhostSpineSubstitutesTest.php
new file mode 100644
index 00000000000..1d520bbbee0
--- /dev/null
+++ b/test/unit/SelfhostSpineSubstitutesTest.php
@@ -0,0 +1,27 @@
+assertStringContainsString("'src/llvm-env.php' => 'test/bootstrap-aot/llvm_env_spine_shim.php'", $script);
+ $this->assertStringContainsString("'src/macro_functions.php' => 'test/bootstrap-aot/macro_functions_spine_shim.php'", $script);
+ $this->assertStringNotContainsString("'src/yay-php8-compat.php'", $script);
+ }
+
+ public function testSpineMainRequiresYayCompatAndShims(): void
+ {
+ $root = dirname(__DIR__, 2);
+ $main = (string) file_get_contents($root.'/test/selfhost/compiler_lib_spine_smoke/main.php');
+ $this->assertStringContainsString('src/yay-php8-compat.php', $main);
+ $this->assertStringContainsString('llvm_env_spine_shim.php', $main);
+ $this->assertStringContainsString('macro_functions_spine_shim.php', $main);
+ }
+}