Address review

Author: Girgias

Zend/Optimizer/dce.c

@@ -95,6 +95,8 @@ static inline bool may_have_side_effects(
 		case ZEND_DIV:
 		case ZEND_MOD:
 		case ZEND_BOOL_XOR:
+		case ZEND_BOOL:
+		case ZEND_BOOL_NOT:
 		case ZEND_BW_NOT:
 		case ZEND_SL:
 		case ZEND_SR:
@@ -104,6 +106,7 @@ static inline bool may_have_side_effects(
 		case ZEND_IS_SMALLER_OR_EQUAL:
 		case ZEND_CASE:
 		case ZEND_CASE_STRICT:
+		case ZEND_CAST:
 		case ZEND_ROPE_INIT:
 		case ZEND_ROPE_ADD:
 		case ZEND_INIT_ARRAY:
@@ -123,27 +126,6 @@ static inline bool may_have_side_effects(
 		case ZEND_ARRAY_KEY_EXISTS:
 			/* No side effects */
 			return 0;
-		case ZEND_CAST: {
-			uint32_t t1 = OP1_INFO();
-			/* Cast from NAN emits warning */
-			if (t1 & MAY_BE_DOUBLE) {
-				return true;
-			}
-			if (t1 & MAY_BE_ARRAY) {
-				/* Array cast to string emits warning */
-				return opline->extended_value == IS_STRING;
-			}
-			return false;
-		}
-		case ZEND_BOOL:
-		case ZEND_BOOL_NOT: {
-			uint32_t t1 = OP1_INFO();
-			/* Cast from NAN emits warning */
-			if (t1 & MAY_BE_DOUBLE) {
-				return true;
-			}
-			return false;
-		}
 		case ZEND_FREE:
 			return opline->extended_value == ZEND_FREE_VOID_CAST;
 		case ZEND_ADD_ARRAY_ELEMENT:

Zend/zend_compile.c

@@ -10028,17 +10028,9 @@ ZEND_API bool zend_unary_op_produces_error(uint32_t opcode, const zval *op)
 		return Z_TYPE_P(op) <= IS_TRUE || !zend_is_op_long_compatible(op);
 	}
 	/* Can happen when called from zend_optimizer_eval_unary_op() */
-	if (
-		opcode == ZEND_IS_EQUAL
-		|| opcode == ZEND_IS_NOT_EQUAL
-		|| opcode == ZEND_BOOL
-		|| opcode == ZEND_BOOL_NOT
-	) {
-		/* BW_NOT on string does not convert the string into an integer. */
-		if (Z_TYPE_P(op) == IS_DOUBLE) {
-			return true;
-		}
-		return false;
+	if (opcode == ZEND_BOOL || opcode == ZEND_BOOL_NOT) {
+		/* ZEND_BOOL/ZEND_BOOL_NOT warns when casting NAN. */
+		return Z_TYPE_P(op) == IS_DOUBLE;
 	}
 
 	return 0;

ext/opcache/jit/zend_jit_helpers.c

@@ -2576,7 +2576,7 @@ static void ZEND_FASTCALL zend_jit_invalid_array_access(zval *container)
 	zend_error(E_WARNING, "Trying to access array offset on %s", zend_zval_value_name(container));
 }
 
-static void ZEND_FASTCALL zend_jit_check_nan_to_bool_coercion(void)
+static void ZEND_FASTCALL zend_jit_nan_coerced_to_type_warning(void)
 {
 	zend_nan_coerced_to_type_warning(_IS_BOOL);
 }

ext/opcache/jit/zend_jit_ir.c

@@ -16,6 +16,7 @@
  *  +----------------------------------------------------------------------+
  */
 
+#include "../../../Zend/zend_types.h"
 #include "Zend/zend_type_info.h"
 #include "jit/ir/ir.h"
 #include "jit/ir/ir_builder.h"
@@ -7562,7 +7563,10 @@ static int zend_jit_bool_jmpznz(zend_jit_ctx *jit, const zend_op *opline, uint32
 	}
 
 	if (Z_MODE(op1_addr) == IS_CONST_ZVAL) {
-		if (zend_is_true(Z_ZV(op1_addr))) {
+		zval *op1 = Z_ZV(op1_addr);
+		/* NAN Value must cause a warning to be emitted */
+		// TODO This breaks function JIT
+		if (Z_TYPE_P(op1) != IS_DOUBLE && !zend_isnan(Z_DVAL_P(op1)) && zend_is_true(op1)) {
 			always_true = 1;
 		} else {
 			always_false = 1;
@@ -7730,10 +7734,11 @@ static int zend_jit_bool_jmpznz(zend_jit_ctx *jit, const zend_op *opline, uint32
 			ir_IF_TRUE(if_double);
 		}
 
-		ir_ref dval = jit_Z_DVAL(jit, op1_addr);ir_ref is_nan = ir_NE(dval, dval);
+		ir_ref dval = jit_Z_DVAL(jit, op1_addr);
+		ir_ref is_nan = ir_NE(dval, dval);
 		ir_ref if_val = ir_IF(is_nan);
 		ir_IF_TRUE_cold(if_val);
-			ir_CALL(IR_VOID, ir_CONST_FC_FUNC(zend_jit_check_nan_to_bool_coercion));
+			ir_CALL(IR_VOID, ir_CONST_FC_FUNC(zend_jit_nan_coerced_to_type_warning));
 		ir_MERGE_WITH_EMPTY_FALSE(if_val);
 
 		ref = ir_NE(dval, ir_CONST_DOUBLE(0.0));

ext/opcache/tests/jit/nan_bool_cast.phpt

@@ -0,0 +1,15 @@
+--TEST--
+Const NAN with bool cast should emit 1 warning
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+--EXTENSIONS--
+opcache
+--FILE--
+<?php
+echo (bool)NAN;
+?>
+--EXPECTF--
+Warning: unexpected NAN value was coerced to bool in %s on line 2
+1