[pull] master from php:master

NEWS

@@ -16,6 +16,8 @@ PHP                                                                        NEWS
   . Fixed bug GH-20174 (Assertion failure in
     ReflectionProperty::skipLazyInitialization after failed LazyProxy
     initialization). (Arnaud)
+  . Enabled the TAILCALL VM on Windows when compiling with Clang >= 19 x86_64.
+    (henderkes)
 
 - BCMath:
   . Added NUL-byte validation to BCMath functions. (jorgsowa)

UPGRADING

@@ -304,6 +304,8 @@ PHP 8.6 UPGRADE NOTES
     callbacks from internal functions and providing for better insight for the
     JIT.
   . The performance of the TAILCALL VM has been improved.
+  . The TAILCALL VM is now enabled on Windows when compiling with Clang >= 19
+    x86_64.
 
 - DOM:
   . Made splitText() faster and consume less memory.

Zend/tests/vm_kind_tailcall_clang_windows.phpt

@@ -0,0 +1,25 @@
+--TEST--
+Tailcall VM is selected when compiled with Clang >= 19 on Windows x64
+--SKIPIF--
+<?php
+if (PHP_OS_FAMILY !== 'Windows') die('skip Windows only');
+if (php_uname('m') !== 'AMD64') die('skip x64 only');
+
+ob_start();
+phpinfo(INFO_GENERAL);
+$info = ob_get_clean();
+
+if (!preg_match('/Compiler => clang version (\d+)/', $info, $m)) {
+    die('skip not compiled with clang');
+}
+
+if ((int)$m[1] < 19) {
+    die('skip requires clang >= 19');
+}
+?>
+--FILE--
+<?php
+var_dump(ZEND_VM_KIND);
+?>
+--EXPECT--
+string(21) "ZEND_VM_KIND_TAILCALL"

Zend/zend_vm_gen.php

@@ -2497,7 +2497,7 @@ function gen_vm_opcodes_header(
         $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(__aarch64__))\n";
+        $str .= "#elif defined(HAVE_MUSTTAIL) && defined(HAVE_PRESERVE_NONE) && (defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__))\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";

docs/release-process.md

@@ -1087,34 +1087,27 @@ volunteers to begin the selection process for the next release managers.
    * php-general@lists.php.net (email php-general+subscribe@lists.php.net)
    * php-qa@lists.php.net (email php-qa+subscribe@lists.php.net)
 
-4. Email systems@php.net to get setup for access to downloads.php.net, to be
-   added to the release-managers@php.net distribution list, and to be added to
-   the moderators for php-announce@lists.php.net so you are able to moderate
-   your release announcements.
-
-   Provide the following information in a single email:
-
-   - An SSH public key, preferably a new unique one for PHP systems and
-     projects.
-   - Read [Machine Access](https://wiki.php.net/systems#machine_access) to set
-     up access to downloads.php.net through jump hosts, and provide a
-     `.google_authenticator` file for 2FA.
-   - Your @php.net email address to use for the release-managers@php.net
-     distribution list and php-announce@lists.php.net moderator address. This
-     should preferably not forward to a Gmail address.
-   - Your GitHub account name, so that your membership to the release managers
-     group may be approved.
-
-   A system admin will then contact you to go through with steps 5 through 8 of
-   [2FA setup instructions](https://wiki.php.net/systems#fa_setup_instructions).
+4. File a [ticket in the infrastructure](https://github.com/php/infrastructure/issues/new?template=request-release-manager-access.yml)
+   project and provide an SSH key, your @php.net email address, your GitHub
+   account name, and your preferred system account name. Preferrably they're
+   all the same!
+
+5. Read [Logging into Servers](https://github.com/php/infrastructure/blob/main/docs/ServerAccess.rst#logging-into-servers) to set up
+   access to downloads.php.net through jump hosts with 2FA.
+
+   Then [create a Google Authenticator file](https://github.com/php/infrastructure/blob/main/docs/ServerAccess.rst#creating-google-authenticator-files),
+   and provide the `.google_authenticator` file that this created, as
+   attachment to an email to systems@php.net. In this email you should also
+   provide a link to the ticket in the infrastructure project that you have
+   created in the previous step
 
    > 💬 **Hint** \
    > To send email from your @php.net address, you will need to use a custom
    > SMTP server. If you use Gmail, you may
    > "[Send emails from a different address or alias][]."
 
 
-5. Create a [GPG key][] for your @php.net address.
+6. Create a [GPG key][] for your @php.net address.
 
    > 💡 **Tip** \
    > If you're new to GPG, follow GitHub's instructions for
@@ -1179,7 +1172,7 @@ volunteers to begin the selection process for the next release managers.
    git push
    ```
 
-6. Make sure you have the following repositories cloned locally:
+7. Make sure you have the following repositories cloned locally:
 
    * https://github.com/php/php-src
    * https://github.com/php/web-php

ext/opcache/jit/zend_jit_ir.c

@@ -3314,6 +3314,27 @@ static PRUNTIME_FUNCTION zend_jit_unwind_callback(DWORD64 pc, PVOID context)
 
 static void zend_jit_setup_unwinder(void)
 {
+#if ZEND_VM_KIND == ZEND_VM_KIND_TAILCALL
+	/* TAILCALL VM: fixed_save_regset=0, no registers pushed in prologue.
+	 * fixed_stack_frame_size=40, fixed_call_stack_size=48 (16+IR_SHADOW_ARGS).
+	 * Prologue is: sub rsp, 0x58 (88 bytes = 40+48). */
+	static const unsigned char uw_data[] = {
+		0x01, // Version=1, Flags=0
+		0x04, // Size of prolog (sub rsp,imm8 = 4 bytes: 48 83 ec 58)
+		0x01, // Count of unwind codes
+		0x00, // Frame Register=none
+		0x04, 0xa2, // offset 4: UWOP_ALLOC_SMALL info=10, alloc=(10+1)*8=88
+		0x00, 0x00, // padding
+	};
+	/* Exit call variant: base 88 + 304 (shadow+GP+FP+padding) = 392 (0x188) */
+	static const unsigned char uw_data_exitcall[] = {
+		0x01, // Version=1, Flags=0
+		0x07, // Size of prolog (sub rsp,imm32 = 7 bytes: 48 81 ec 88 01 00 00)
+		0x02, // Count of unwind codes
+		0x00, // Frame Register=none
+		0x07, 0x01, 0x31, 0x00, // offset 7: UWOP_ALLOC_LARGE info=0, size/8=49, alloc=392
+	};
+#else
 	/* Hardcoded SEH unwind data for JIT-ed PHP functions with "fixed stack frame" */
 	static const unsigned char uw_data[] = {
 		0x01, // UBYTE: 3 Version , UBYTE: 5 Flags
@@ -3348,6 +3369,7 @@ static void zend_jit_setup_unwinder(void)
 		0x02, 0x50, // 1: pushq %rbp
 		0x01, 0x30, // 0: pushq %rbx
 	};
+#endif
 
 	zend_jit_uw_func = (PRUNTIME_FUNCTION)*dasm_ptr;
 	*dasm_ptr = (char*)*dasm_ptr + ZEND_MM_ALIGNED_SIZE_EX(sizeof(RUNTIME_FUNCTION) * 4 +

win32/build/confutils.js

@@ -3374,6 +3374,10 @@ function toolset_setup_common_cflags()
 
 		var vc_ver = probe_binary(PATH_PROG('cl', null));
 		ADD_FLAG("CFLAGS"," -fms-compatibility -fms-compatibility-version=" + vc_ver + " -fms-extensions");
+
+        if (CLANGVERS >= 1900 && TARGET_ARCH === 'x64') {
+            AC_DEFINE('HAVE_PRESERVE_NONE', 1, 'Whether the compiler supports __attribute__((preserve_none))');
+        }
 	}
 
 	if (!CLANG_TOOLSET) {