Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  JIT: Fixed NaN handling

Author: dstogov

ext/opcache/jit/zend_jit_x86.dasc

@@ -8635,51 +8635,47 @@ static int zend_jit_bool_jmpznz(dasm_State **Dst, const zend_op *opline, uint32_
 		if (set_bool) {
 			if (exit_addr) {
 				if (branch_opcode == ZEND_JMPNZ || branch_opcode == ZEND_JMPNZ_EX) {
-					|	jp >1
 					|	SET_ZVAL_TYPE_INFO res_addr, IS_TRUE
+					|	jp &exit_addr
 					|	jne &exit_addr
-					|1:
 					|	SET_ZVAL_TYPE_INFO res_addr, IS_FALSE
 				} else {
-					|	SET_ZVAL_TYPE_INFO res_addr, IS_FALSE
 					|	jp >1
+					|	SET_ZVAL_TYPE_INFO res_addr, IS_FALSE
 					|	je &exit_addr
 					|1:
 					|	SET_ZVAL_TYPE_INFO res_addr, IS_TRUE
 				}
-			} else if (false_label != (uint32_t)-1) { // JMPZ_EX
+			} else if (false_label != (uint32_t)-1) { // JMPZ_EX (p=>true, z=>false, false=>jmp)
+				|	jp  >1
 				|	SET_ZVAL_TYPE_INFO res_addr, IS_FALSE
-				|	jp >1
-				|	je => false_label
-				|	SET_ZVAL_TYPE_INFO res_addr, IS_TRUE
+				|	je  => false_label
 				|1:
-			} else if (true_label != (uint32_t)-1) { // JMPNZ_EX
-				|	jp >1
 				|	SET_ZVAL_TYPE_INFO res_addr, IS_TRUE
-				|	jne => true_label
-				|1:
+			} else if (true_label != (uint32_t)-1) { // JMPNZ_EX (p=>true, z=>false, true=>jmp)
+				|	SET_ZVAL_TYPE_INFO res_addr, IS_TRUE
+				|	jp  => true_label
+				|	jne  => true_label
 				|	SET_ZVAL_TYPE_INFO res_addr, IS_FALSE
-			} else if (set_bool_not) { // BOOL_NOT
+			} else if (set_bool_not) { // BOOL_NOT (p=>false, z=>true)
+				|	mov eax, IS_FALSE
 				|	jp >1
+				|	jne >1
 				|	mov eax, IS_TRUE
-				|	je >2
 				|1:
-				|	mov eax, IS_FALSE
-				|2:
 				|	SET_ZVAL_TYPE_INFO res_addr, eax
-			} else { // BOOL
-				|	jp >1
+			} else { // BOOL (p=>true, z=>false)
 				|	mov eax, IS_TRUE
-				|	jne >2
-				|1:
+				|	jp >1
+				|	jne >1
 				|	mov eax, IS_FALSE
-				|2:
+				|1:
 				|	SET_ZVAL_TYPE_INFO res_addr, eax
 			}
 		} else {
 			if (exit_addr) {
 				if (branch_opcode == ZEND_JMPNZ || branch_opcode == ZEND_JMPNZ_EX) {
-					|	jp >1
+					|	jp &exit_addr
 					|	jne &exit_addr
 					|1:
 				} else {
@@ -8689,20 +8685,17 @@ static int zend_jit_bool_jmpznz(dasm_State **Dst, const zend_op *opline, uint32_
 				}
 			} else {
 				ZEND_ASSERT(true_label != (uint32_t)-1 || false_label != (uint32_t)-1);
-				if (false_label != (uint32_t)-1) {
-					|	jp =>false_label
-				} else {
-					|	jp >1
-				}
-				if (true_label != (uint32_t)-1) {
-					|	jne =>true_label
-					if (false_label != (uint32_t)-1) {
-						|	jmp =>false_label
+				if (false_label != (uint32_t)-1 ) {
+					|	jp  >1
+					|	je  => false_label
+					|1:
+					if (true_label != (uint32_t)-1) {
+						|	jmp =>true_label
 					}
 				} else {
-					|	je =>false_label
+					|	jp  => true_label
+					|	jne  => true_label
 				}
-				|1:
 			}
 		}
 	} else if (op1_info & (MAY_BE_ANY - (MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG))) {

ext/opcache/tests/jit/nan_002.phpt

@@ -0,0 +1,56 @@
+--TEST--
+NaN handling: 002
+--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(float $a) {
+    if ($a) var_dump("1");
+    if (!$a) var_dump("2");    
+    var_dump((bool) $a);
+    var_dump(!$a);
+    echo "\n";
+}
+function test1(float $a, bool $b) {
+    var_dump($a && $b); //JMPNZ_EX 
+}
+function test2(float $a, bool $b) {
+    var_dump($a || $b); // JMPZ_EX
+}
+test(NAN);
+test(1.0);
+test(0.0);
+
+test1(NAN, true);
+test1(1.0, true);
+test1(0.0, true);
+echo "\n";
+
+test2(NAN, false);
+test2(1.0, false);
+test2(0.0, false);
+?>
+--EXPECT--
+string(1) "1"
+bool(true)
+bool(false)
+
+string(1) "1"
+bool(true)
+bool(false)
+
+string(1) "2"
+bool(false)
+bool(true)
+
+bool(true)
+bool(true)
+bool(false)
+
+bool(true)
+bool(true)
+bool(false)