Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Fixed bug GH-8847 (PHP hanging infinitly at 100% cpu when check php syntaxe of a valid file)

Author: dstogov

NEWS

@@ -13,6 +13,10 @@ PHP                                                                        NEWS
   . Fixed bug GH-8848 (imagecopyresized() error refers to the wrong argument).
     (cmb)
 
+- OPcache:
+  . Fixed bug GH-8847 (PHP hanging infinitly at 100% cpu when check php
+    syntaxe of a valid file). (Dmitry)
+
 07 Jul 2022, PHP 8.1.8
 
 - Core:

ext/opcache/jit/zend_jit.c

@@ -1672,22 +1672,18 @@ static void zend_jit_add_hint(zend_lifetime_interval **intervals, int dst, int s
 		src = dst;
 		dst = tmp;
 	}
-	while (1) {
-		if (intervals[dst]->hint) {
-			if (intervals[dst]->hint->range.start < intervals[src]->range.start) {
-				int tmp = src;
-				src = intervals[dst]->hint->ssa_var;
-				dst = tmp;
-			} else {
-				dst = intervals[dst]->hint->ssa_var;
-			}
+	while (dst != src && intervals[dst]->hint) {
+		if (intervals[dst]->hint->range.start < intervals[src]->range.start) {
+			int tmp = src;
+			src = intervals[dst]->hint->ssa_var;
+			dst = tmp;
 		} else {
-			if (dst != src) {
-				intervals[dst]->hint = intervals[src];
-			}
-			return;
+			dst = intervals[dst]->hint->ssa_var;
 		}
 	}
+	if (dst == src) {
+		intervals[dst]->hint = intervals[src];
+	}
 }
 
 /* See "Linear Scan Register Allocation on SSA Form", Christian Wimmer and

ext/opcache/tests/jit/gh8847.phpt

@@ -0,0 +1,25 @@
+--TEST--
+Bug GH-8847: PHP hanging infinitly at 100% cpu when check php syntaxe of a valid file
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=1M
+--FILE--
+<?php
+class klass
+{
+    public function method(int $int, bool $bool=false) : int
+    {
+        while($int >= 0 && !$function1)
+            $int--;
+        if($bool)
+            while($int >= 0 && $function1)
+                $int--;
+        return $int;
+    }
+}
+?>
+DONE
+--EXPECTF--
+DONE