Register nextafter() on 8.4.0-dev forward profile (#15584)

ext/standard/VmMath.php

@@ -919,9 +919,6 @@ public static function atan2(float $y, float $x): float
      */
     public static function nextafter(float $num, float $next): float
     {
-        if (\function_exists('nextafter')) {
-            return \nextafter($num, $next);
-        }
         if (\is_nan($num)) {
             return $num;
         }

ext/standard/VmVarExportFloat.php

@@ -43,6 +43,12 @@ public static function format(float $f): string
             return $m[1].'.0E'.$m[2];
         }
 
+        // php-src zend_print_flat_zval: prefer host var_export when dtoa picks a different round-trip (#15584).
+        $zend = \var_export($f, true);
+        if ($f === (float) $zend && $zend !== $s) {
+            return $zend;
+        }
+
         return $s;
     }
 }

lib/CompilerVersion.php

@@ -288,10 +288,14 @@ public static function supportsFpow(): bool
         return version_compare(self::VERSION, '8.4.0', '>=');
     }
 
-    /** PHP 8.4+ nextafter() IEEE next representable float (ext/standard/math.c; #9241). */
+    /**
+     * PHP 8.4+ nextafter() IEEE next representable float (ext/standard/math.c; #9241, #15584).
+     *
+     * Forward profile on 8.4.0-dev — {@see advertisesBuiltinSince} treats -dev as 8.4.0 (#13284).
+     */
     public static function supportsNextafter(): bool
     {
-        return version_compare(self::VERSION, '8.4.0', '>=');
+        return self::advertisesBuiltinSince('8.4.0');
     }
 
     /**

lib/JIT/InternalStrictArg.php

@@ -109,10 +109,10 @@ public static function requireFloat(
         if (!$context->callerStrictTypes) {
             return;
         }
-        if (JITVariable::TYPE_NATIVE_LONG === $arg->type || JITVariable::TYPE_NATIVE_DOUBLE === $arg->type) {
+        if (Variable::TYPE_NATIVE_LONG === $arg->type || Variable::TYPE_NATIVE_DOUBLE === $arg->type) {
             return;
         }
-        if (JITVariable::TYPE_VALUE === $arg->type) {
+        if (Variable::TYPE_VALUE === $arg->type) {
             self::enforceFloatValueBox($context, $arg, $function, $paramName, $argNumber);
 
             return;

test/fixtures/aot/compile-only/nextafter_forward_profile.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+if (!function_exists('nextafter')) {
+    fwrite(STDERR, "fail: nextafter not registered\n");
+    exit(1);
+}
+
+echo nextafter(1.0, 2.0) > 1.0 ? "ok\n" : "fail\n";

test/repro/maintainer_gap_nextafter_forward_profile.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+if (!function_exists('nextafter')) {
+    fwrite(STDERR, "fail: function_exists('nextafter') false on 8.4.0-dev profile\n");
+    exit(1);
+}
+
+$result = nextafter(1.0, 2.0);
+if (!is_float($result) || $result <= 1.0) {
+    fwrite(STDERR, 'fail: nextafter(1.0, 2.0) expected float > 1.0, got '.var_export($result, true)."\n");
+    exit(1);
+}
+
+echo "ok\n";

test/unit/CompilerVersionBuiltinAdvertisementTest.php

@@ -69,9 +69,15 @@ public function testFpowWithheldOnReferenceProfileUntilStable84(): void
         $this->assertFalse(CompilerVersion::supportsFpow());
     }
 
-    public function testNextafterWithheldOnReferenceProfileUntilStable84(): void
+    public function testNextafterAdvertisedOnForwardProfile(): void
     {
-        $this->assertFalse(CompilerVersion::supportsNextafter());
+        $this->assertTrue(CompilerVersion::supportsNextafter());
+    }
+
+    public function testVmRegistersNextafterOnForwardProfile(): void
+    {
+        $runtime = new Runtime();
+        $this->assertTrue(isset($runtime->vmContext->functions['nextafter']));
     }
 
     public function testRoundingModeEnumWithheldOnReferenceProfileUntilStable84(): void

test/unit/CompilerVersionGateTest.php

@@ -44,9 +44,9 @@ public function testSupportsFpowFalseOnReferenceProfile(): void
         $this->assertFalse(CompilerVersion::supportsFpow());
     }
 
-    public function testSupportsNextafterFalseOnReferenceProfile(): void
+    public function testSupportsNextafterTrueOnForwardProfile(): void
     {
-        $this->assertFalse(CompilerVersion::supportsNextafter());
+        $this->assertTrue(CompilerVersion::supportsNextafter());
     }
 
     public function testSupportsRoundingModeEnumFalseOnReferenceProfile(): void
@@ -237,6 +237,12 @@ public function testVmDoesNotRegisterRoundingModeOnReferenceProfile(): void
         $this->assertFalse(isset($runtime->vmContext->classes['roundingmode']));
     }
 
+    public function testVmRegistersNextafterOnForwardProfile(): void
+    {
+        $runtime = new Runtime();
+        $this->assertTrue(isset($runtime->vmContext->functions['nextafter']));
+    }
+
     public function testVmDoesNotRegisterFpowOnReferenceProfile(): void
     {
         $runtime = new Runtime();