JIT ARM64: Fixed NaN handling

Author: dstogov

ext/opcache/jit/zend_jit_arm64.dasc

@@ -8076,51 +8076,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) {
-					|	bvs >1
 					|	SET_ZVAL_TYPE_INFO res_addr, IS_TRUE, TMP1w, TMP2
+					|	bvs &exit_addr
 					|	bne &exit_addr
-					|1:
 					|	SET_ZVAL_TYPE_INFO res_addr, IS_FALSE, TMP1w, TMP2
 				} else {
-					|	SET_ZVAL_TYPE_INFO res_addr, IS_FALSE, TMP1w, TMP2
 					|	bvs >1
+					|	SET_ZVAL_TYPE_INFO res_addr, IS_FALSE, TMP1w, TMP2
 					|	beq &exit_addr
 					|1:
 					|	SET_ZVAL_TYPE_INFO res_addr, IS_TRUE, TMP1w, TMP2
 				}
 			} else if (false_label != (uint32_t)-1) { // JMPZ_EX
-				|	SET_ZVAL_TYPE_INFO res_addr, IS_FALSE, TMP1w, TMP2
 				|	bvs >1
+				|	SET_ZVAL_TYPE_INFO res_addr, IS_FALSE, TMP1w, TMP2
 				|	beq => false_label
-				|	SET_ZVAL_TYPE_INFO res_addr, IS_TRUE, TMP1w, TMP2
 				|1:
+				|	SET_ZVAL_TYPE_INFO res_addr, IS_TRUE, TMP1w, TMP2
 			} else if (true_label != (uint32_t)-1) { // JMPNZ_EX
-				|	bvs >1
 				|	SET_ZVAL_TYPE_INFO res_addr, IS_TRUE, TMP1w, TMP2
+				|	bvs => true_label
 				|	bne => true_label
-				|1:
 				|	SET_ZVAL_TYPE_INFO res_addr, IS_FALSE, TMP1w, TMP2
 			} else if (set_bool_not) { // BOOL_NOT
+				|	mov REG0w, #IS_FALSE
 				|	bvs >1
+				|	bne >1
 				|	mov REG0w, #IS_TRUE
-				|	beq >2
 				|1:
-				|	mov REG0w, #IS_FALSE
-				|2:
 				|	SET_ZVAL_TYPE_INFO_FROM_REG res_addr, REG0w, TMP1
 			} else { // BOOL
-				|	bvs >1
 				|	mov REG0w, #IS_TRUE
-				|	bne >2
-				|1:
+				|	bvs >1
+				|	bne >1
 				|	mov REG0w, #IS_FALSE
-				|2:
+				|1:
 				|	SET_ZVAL_TYPE_INFO_FROM_REG res_addr, REG0w, TMP1
 			}
 		} else {
 			if (exit_addr) {
 				if (branch_opcode == ZEND_JMPNZ || branch_opcode == ZEND_JMPNZ_EX) {
-					|	bvs >1
+					|	bvs &exit_addr
 					|	bne &exit_addr
 					|1:
 				} else {
@@ -8130,20 +8126,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) {
-					|	bvs =>false_label
-				} else {
-					|	bvs >1
-				}
-				if (true_label != (uint32_t)-1) {
-					|	bne =>true_label
-					if (false_label != (uint32_t)-1) {
-						|	b =>false_label
+				if (false_label != (uint32_t)-1 ) {
+					|	bvs  >1
+					|	beq  => false_label
+					|1:
+					if (true_label != (uint32_t)-1) {
+						|	b =>true_label
 					}
 				} else {
-					|	beq =>false_label
+					|	bvs  => true_label
+					|	bne  => true_label
 				}
-				|1:
 			}
 		}
 	} else if (op1_info & (MAY_BE_ANY - (MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG))) {