IR JIT: Fixed inaccurate range inference usage for UNDEF/NULL/FALSE

dstogov · dstogov · commit 6f01fd9b32a3 · 2023-09-06T00:03:19.000+03:00
diff --git a/ext/opcache/jit/ir b/ext/opcache/jit/ir
@@ -1 +1 @@
-Subproject commit 367d2e324654930342295e008bd077352477df19
+Subproject commit 1bbee7b9daa7773254720d9204fa4f3457435f6d
diff --git a/ext/opcache/jit/zend_jit_ir.c b/ext/opcache/jit/zend_jit_ir.c
@@ -5198,7 +5198,7 @@ static int zend_jit_long_math_helper(zend_jit_ctx   *jit,
 			ir_ref zero_path = 0;
 
 			ref = jit_Z_LVAL(jit, op2_addr);
-			if (!op2_range || (op2_range->min <= 0 && op2_range->max >= 0)) {
+			if ((op2_type & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) || !op2_range || (op2_range->min <= 0 && op2_range->max >= 0)) {
 				ir_ref if_ok = ir_IF(ref);
 				ir_IF_FALSE(if_ok);
 				jit_SET_EX_OPLINE(jit, opline);
