Merge remote-tracking branch 'origin/master' into opcache/file_cache_read_only

Author: iamacarpet

Zend/tests/gh16509.phpt

@@ -1,5 +1,16 @@
 --TEST--
 GH-16509: Incorrect lineno reported for function redeclaration
+--SKIPIF--
+<?php
+$tracing = extension_loaded("Zend OPcache")
+    && ($conf = opcache_get_configuration()["directives"])
+    && array_key_exists("opcache.jit", $conf)
+    &&  $conf["opcache.jit"] === "tracing";
+if (PHP_OS_FAMILY === "Windows" && PHP_INT_SIZE == 8 && $tracing) {
+    $url = "https://github.com/php/php-src/pull/14919#issuecomment-2259003979";
+    die("xfail Test fails on Windows x64 (VS17) and tracing JIT; see $url");
+}
+?>
 --FILE--
 <?php