Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  JIT: Fixed incorrect code generation for JMPZ

Author: dstogov

ext/opcache/jit/zend_jit_arm64.dasc

@@ -14765,10 +14765,20 @@ static bool zend_jit_opline_supports_reg(const zend_op_array *op_array, zend_ssa
 			op1_info = OP1_INFO();
 			return (opline->op1_type & (IS_CV|IS_CONST))
 				&& (op1_info & (MAY_BE_ANY|MAY_BE_REF|MAY_BE_UNDEF)) == MAY_BE_ARRAY;
-		case ZEND_BOOL:
-		case ZEND_BOOL_NOT:
 		case ZEND_JMPZ:
 		case ZEND_JMPNZ:
+			if (JIT_G(trigger) != ZEND_JIT_ON_HOT_TRACE) {
+				if (!ssa->cfg.map) {
+					return 0;
+				}
+				if (opline > op_array->opcodes + ssa->cfg.blocks[ssa->cfg.map[opline-op_array->opcodes]].start &&
+				    ((opline-1)->result_type & (IS_SMART_BRANCH_JMPZ|IS_SMART_BRANCH_JMPNZ)) != 0) {
+					return 0;
+				}
+			}
+			ZEND_FALLTHROUGH;
+		case ZEND_BOOL:
+		case ZEND_BOOL_NOT:
 		case ZEND_JMPZNZ:
 		case ZEND_JMPZ_EX:
 		case ZEND_JMPNZ_EX:

ext/opcache/jit/zend_jit_trace.c

@@ -1771,13 +1771,6 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
 					break;
 				case ZEND_JMPZ:
 				case ZEND_JMPNZ:
-					if (/*opline > op_array->opcodes + ssa->cfg.blocks[b].start && ??? */
-					    opline->op1_type == IS_TMP_VAR &&
-					    ((opline-1)->result_type & (IS_SMART_BRANCH_JMPZ|IS_SMART_BRANCH_JMPNZ)) != 0) {
-						/* smart branch */
-						break;
-					}
-					ZEND_FALLTHROUGH;
 				case ZEND_JMPZNZ:
 				case ZEND_JMPZ_EX:
 				case ZEND_JMPNZ_EX:
@@ -5213,13 +5206,6 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 						goto done;
 					case ZEND_JMPZ:
 					case ZEND_JMPNZ:
-						if (/*opline > op_array->opcodes + ssa->cfg.blocks[b].start && ??? */
-						    opline->op1_type == IS_TMP_VAR &&
-						    ((opline-1)->result_type & (IS_SMART_BRANCH_JMPZ|IS_SMART_BRANCH_JMPNZ)) != 0) {
-							/* smart branch */
-							break;
-						}
-						ZEND_FALLTHROUGH;
 					case ZEND_JMPZNZ:
 					case ZEND_JMPZ_EX:
 					case ZEND_JMPNZ_EX:

ext/opcache/jit/zend_jit_x86.dasc

@@ -15630,10 +15630,20 @@ static bool zend_jit_opline_supports_reg(const zend_op_array *op_array, zend_ssa
 			op1_info = OP1_INFO();
 			return (opline->op1_type & (IS_CV|IS_CONST))
 				&& (op1_info & (MAY_BE_ANY|MAY_BE_REF|MAY_BE_UNDEF)) == MAY_BE_ARRAY;
-		case ZEND_BOOL:
-		case ZEND_BOOL_NOT:
 		case ZEND_JMPZ:
 		case ZEND_JMPNZ:
+			if (JIT_G(trigger) != ZEND_JIT_ON_HOT_TRACE) {
+				if (!ssa->cfg.map) {
+					return 0;
+				}
+				if (opline > op_array->opcodes + ssa->cfg.blocks[ssa->cfg.map[opline-op_array->opcodes]].start &&
+				    ((opline-1)->result_type & (IS_SMART_BRANCH_JMPZ|IS_SMART_BRANCH_JMPNZ)) != 0) {
+					return 0;
+				}
+			}
+			ZEND_FALLTHROUGH;
+		case ZEND_BOOL:
+		case ZEND_BOOL_NOT:
 		case ZEND_JMPZNZ:
 		case ZEND_JMPZ_EX:
 		case ZEND_JMPNZ_EX:

ext/opcache/tests/jit/jmpz_002.phpt

@@ -0,0 +1,20 @@
+--TEST--
+JIT JMPZ: Separate JMPZ for "smart branch" may be only emitted by function JIT
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=1M
+opcache.protect_memory=1
+--FILE--
+<?php
+function test($b) {
+    if ($b ? 0 : (X>0)){
+        echo "Not taken\n";
+    }
+}
+test(true);
+?>
+DONE
+--EXPECT--
+DONE