Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
  Fix phpGH-17836: zend_vm_gen.php shouldn't break on Windows line endings

Author: ndossche

NEWS

@@ -84,6 +84,10 @@ PHP                                                                        NEWS
 - Treewide:
   . Fixed bug GH-17736 (Assertion failure zend_reference_destroy()). (nielsdos)
 
+- Windows:
+  . Fixed bug GH-17836 (zend_vm_gen.php shouldn't break on Windows line
+    endings). (DanielEScherzer)
+
 27 Feb 2025, PHP 8.4.5
 
 - BCMath:

Zend/zend_vm_gen.php

@@ -2416,6 +2416,12 @@ function gen_vm($def, $skel) {
     $max_opcode     = 0;
     $extra_num      = 256;
     foreach ($in as $line) {
+        // Handle Windows line endings, GH-17836; since a bunch of regular
+        // expressions below test for a newline at the end, just update the
+        // ending
+        if (substr($line, -2) === "\r\n") {
+            $line = substr_replace($line, "\n", -2);
+        }
         ++$lineno;
         if (strpos($line,"ZEND_VM_HANDLER(") === 0 ||
             strpos($line,"ZEND_VM_INLINE_HANDLER(") === 0 ||