Commit 2cb2846a160 for php.net

commit 2cb2846a160327f9bafcc583f3412ac0d242b316
Merge: 054b24f5c43 94918465230
Author: Arnaud Le Blanc <arnaud.lb@gmail.com>
Date:   Thu Aug 6 16:47:48 2026 +0200

    Merge branch 'PHP-8.5'

    * PHP-8.5:
      Fix GH-22206: Enable the TAILCALL VM only on Clang (#23054)

diff --cc Zend/zend_vm_gen.php
index 8e65bc0a28e,6e6349bee0a..e00aff17a92
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@@ -2522,7 -2523,7 +2522,7 @@@ ENDNAMES
          $str .= "# define ZEND_VM_KIND\t\tZEND_VM_KIND_HYBRID\n";
      }
      if ($GLOBALS["vm_kind_name"][ZEND_VM_GEN_KIND] === "ZEND_VM_KIND_HYBRID" || $GLOBALS["vm_kind_name"][ZEND_VM_GEN_KIND] === "ZEND_VM_KIND_CALL") {
-         $str .= "#elif defined(HAVE_MUSTTAIL) && defined(HAVE_PRESERVE_NONE) && (defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__))\n";
 -        $str .= "#elif defined(HAVE_MUSTTAIL) && defined(HAVE_PRESERVE_NONE) && (defined(__x86_64__) || defined(__aarch64__)) && defined(__clang__)\n";
++        $str .= "#elif defined(HAVE_MUSTTAIL) && defined(HAVE_PRESERVE_NONE) && (defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__)) && defined(__clang__)\n";
          $str .= "# define ZEND_VM_KIND\t\tZEND_VM_KIND_TAILCALL\n";
          $str .= "#else\n";
          $str .= "# define ZEND_VM_KIND\t\tZEND_VM_KIND_CALL\n";
diff --cc Zend/zend_vm_opcodes.h
index 61147518d36,34e24ec14b1..4e0d3ec43d9
Binary files differ