[RFC] Warn on implicit float to int conversions.

Zend/Optimizer/pass1.c

@@ -119,12 +119,12 @@ void zend_optimizer_pass1(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 				} else if (opline->extended_value == ZEND_MOD
 				 || opline->extended_value == ZEND_SL
 				 || opline->extended_value == ZEND_SR) {
-					if (Z_TYPE(ZEND_OP2_LITERAL(opline)) != IS_LONG) {
-						/* don't optimize if it should produce a runtime numeric string error */
-						if (!(Z_TYPE(ZEND_OP2_LITERAL(opline)) == IS_STRING
-							&& !is_numeric_string(Z_STRVAL(ZEND_OP2_LITERAL(opline)), Z_STRLEN(ZEND_OP2_LITERAL(opline)), NULL, NULL, 0))) {
-							convert_to_long(&ZEND_OP2_LITERAL(opline));
+					zval *op2 = &ZEND_OP2_LITERAL(opline);
+					if (Z_TYPE_P(op2) != IS_LONG) {
+						if (!zend_is_op_long_compatible(op2)) {
+							break;
 						}
+						convert_to_long(op2);
 					}
 				} else if (opline->extended_value == ZEND_CONCAT) {
 					if (Z_TYPE(ZEND_OP2_LITERAL(opline)) != IS_STRING) {

Zend/Optimizer/sccp.c

@@ -425,9 +425,14 @@ static inline int fetch_array_elem(zval **result, zval *op1, zval *op2) {
 		case IS_LONG:
 			*result = zend_hash_index_find(Z_ARR_P(op1), Z_LVAL_P(op2));
 			return SUCCESS;
-		case IS_DOUBLE:
-			*result = zend_hash_index_find(Z_ARR_P(op1), zend_dval_to_lval(Z_DVAL_P(op2)));
+		case IS_DOUBLE: {
+			zend_long lval = zend_dval_to_lval(Z_DVAL_P(op2));
+			if (!zend_is_long_compatible(Z_DVAL_P(op2), lval)) {
+				return FAILURE;
+			}
+			*result = zend_hash_index_find(Z_ARR_P(op1), lval);
 			return SUCCESS;
+		}
 		case IS_STRING:
 			*result = zend_symtable_find(Z_ARR_P(op1), Z_STR_P(op2));
 			return SUCCESS;
@@ -508,9 +513,14 @@ static inline int ct_eval_del_array_elem(zval *result, zval *key) {
 		case IS_LONG:
 			zend_hash_index_del(Z_ARR_P(result), Z_LVAL_P(key));
 			break;
-		case IS_DOUBLE:
-			zend_hash_index_del(Z_ARR_P(result), zend_dval_to_lval(Z_DVAL_P(key)));
+		case IS_DOUBLE: {
+			zend_long lval = zend_dval_to_lval(Z_DVAL_P(key));
+			if (!zend_is_long_compatible(Z_DVAL_P(key), lval)) {
+				return FAILURE;
+			}
+			zend_hash_index_del(Z_ARR_P(result), lval);
 			break;
+		}
 		case IS_STRING:
 			zend_symtable_del(Z_ARR_P(result), Z_STR_P(key));
 			break;
@@ -548,11 +558,16 @@ static inline int ct_eval_add_array_elem(zval *result, zval *value, zval *key) {
 			SEPARATE_ARRAY(result);
 			value = zend_hash_index_update(Z_ARR_P(result), Z_LVAL_P(key), value);
 			break;
-		case IS_DOUBLE:
+		case IS_DOUBLE: {
+			zend_long lval = zend_dval_to_lval(Z_DVAL_P(key));
+			if (!zend_is_long_compatible(Z_DVAL_P(key), lval)) {
+				return FAILURE;
+			}
 			SEPARATE_ARRAY(result);
 			value = zend_hash_index_update(
-				Z_ARR_P(result), zend_dval_to_lval(Z_DVAL_P(key)), value);
+				Z_ARR_P(result), lval, value);
 			break;
+		}
 		case IS_STRING:
 			SEPARATE_ARRAY(result);
 			value = zend_symtable_update(Z_ARR_P(result), Z_STR_P(key), value);

Zend/Optimizer/zend_inference.c

@@ -4481,7 +4481,6 @@ ZEND_API int zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op,
 			return (t1 & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) ||
 				(t2 & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE));
 		case ZEND_DIV:
-		case ZEND_MOD:
 			if (!OP2_HAS_RANGE() ||
 				(OP2_MIN_RANGE() <= 0 && OP2_MAX_RANGE() >= 0)) {
 				/* Division by zero */
@@ -4493,10 +4492,18 @@ ZEND_API int zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op,
 		case ZEND_POW:
 			return (t1 & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) ||
 				(t2 & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE));
+		/* Ops may throw if not an integer */
+		case ZEND_MOD:
+			if (!OP2_HAS_RANGE() ||
+				(OP2_MIN_RANGE() <= 0 && OP2_MAX_RANGE() >= 0)) {
+				/* Division by zero */
+				return 1;
+			}
+			ZEND_FALLTHROUGH;
 		case ZEND_SL:
 		case ZEND_SR:
-			return (t1 & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) ||
-				(t2 & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) ||
+			return (t1 & (MAY_BE_STRING|MAY_BE_DOUBLE|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) ||
+				(t2 & (MAY_BE_STRING|MAY_BE_DOUBLE|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) ||
 				!OP2_HAS_RANGE() ||
 				OP2_MIN_RANGE() < 0;
 		case ZEND_CONCAT:
@@ -4510,10 +4517,10 @@ ZEND_API int zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op,
 			 && (t2 & MAY_BE_ANY) == MAY_BE_STRING) {
 				return 0;
 			}
-			return (t1 & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) ||
-				(t2 & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE));
+			return (t1 & (MAY_BE_STRING|MAY_BE_DOUBLE|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) ||
+				(t2 & (MAY_BE_STRING|MAY_BE_DOUBLE|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE));
 		case ZEND_BW_NOT:
-			return (t1 & (MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE));
+			return (t1 & (MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_DOUBLE|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE));
 		case ZEND_PRE_INC:
 		case ZEND_POST_INC:
 		case ZEND_PRE_DEC:

Zend/tests/array_offset.phpt

@@ -13,9 +13,13 @@ echo "Done\n";
 --EXPECTF--
 Warning: Undefined array key -1 in %s on line %d
 
+Deprecated: Implicit conversion from non-compatible float -1.1 to int in %s on line %d
+
 Warning: Undefined array key -1 in %s on line %d
 
 Warning: Undefined array key -1 in %s on line %d
 
+Deprecated: Implicit conversion from non-compatible float -1.1 to int in %s on line %d
+
 Warning: Undefined array key -1 in %s on line %d
 Done

Zend/tests/bug46701.phpt

@@ -26,7 +26,12 @@ class foo {
 new foo;
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Implicit conversion from non-compatible float 3428599296 to int in %s on line %d
+
+Deprecated: Implicit conversion from non-compatible float 3459455488 to int in %s on line %d
+
+Deprecated: Implicit conversion from non-compatible float 3459616768 to int in %s on line %d
 array(3) {
   [-866368000]=>
   int(1)
@@ -35,7 +40,11 @@ array(3) {
   [-835350528]=>
   int(3)
 }
+
+Deprecated: Implicit conversion from non-compatible float 3459455488 to int in %s on line %d
 int(2)
+
+Deprecated: Implicit conversion from non-compatible float 3459616768 to int in %s on line %d
 array(1) {
   [-835350528]=>
   int(3)

Zend/tests/bug72347.phpt

@@ -12,6 +12,7 @@ function test() : int {
 }
 var_dump(test());
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
 float(1.5)
 int(1)

Zend/tests/constant_expressions_dynamic.phpt

@@ -46,6 +46,8 @@ var_dump(
 ?>
 --EXPECTF--
 Warning: A non-numeric value encountered in %s on line %d
+
+Deprecated: Implicit conversion from non-compatible float 3.14 to int in %s on line %d
 int(3)
 string(4) "1foo"
 bool(false)

Zend/tests/empty_str_offset.phpt

@@ -62,7 +62,7 @@ var_dump(empty($str[$f]));
 print "done\n";
 
 ?>
---EXPECT--
+--EXPECTF--
 - empty ---
 bool(false)
 bool(true)
@@ -98,14 +98,32 @@ bool(true)
 - null ---
 bool(false)
 - double ---
+
+Deprecated: Implicit conversion from non-compatible float -1.1 to int in %s on line %d
 bool(false)
+
+Deprecated: Implicit conversion from non-compatible float -10.5 to int in %s on line %d
 bool(true)
+
+Deprecated: Implicit conversion from non-compatible float -4.1 to int in %s on line %d
 bool(true)
+
+Deprecated: Implicit conversion from non-compatible float -0.8 to int in %s on line %d
 bool(false)
+
+Deprecated: Implicit conversion from non-compatible float -0.1 to int in %s on line %d
 bool(false)
+
+Deprecated: Implicit conversion from non-compatible float 0.2 to int in %s on line %d
 bool(false)
+
+Deprecated: Implicit conversion from non-compatible float 0.9 to int in %s on line %d
 bool(false)
+
+Deprecated: Implicit conversion from non-compatible float 3.141592653589793 to int in %s on line %d
 bool(false)
+
+Deprecated: Implicit conversion from non-compatible float 100.5001 to int in %s on line %d
 bool(true)
 - array ---
 bool(true)

Zend/tests/float_to_int/explicit_casts_should_not_warn.phpt

@@ -0,0 +1,38 @@
+--TEST--
+Explicit (int) cast must not warn
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
+?>
+--FILE--
+<?php
+
+$values =[
+    3.0,
+    3.5,
+    10e120,
+    10e300,
+    fdiv(0, 0),
+    (string) 3.0,
+    (string) 3.5,
+    (string) 10e120,
+    (string) 10e300,
+    (string) fdiv(0, 0),
+];
+
+foreach($values as $value) {
+    var_dump((int) $value);
+}
+
+?>
+--EXPECT--
+int(3)
+int(3)
+int(0)
+int(0)
+int(0)
+int(3)
+int(3)
+int(9223372036854775807)
+int(9223372036854775807)
+int(0)

Zend/tests/float_to_int/explicit_casts_should_not_warn_32bit.phpt

@@ -0,0 +1,38 @@
+--TEST--
+Explicit (int) cast must not warn 32bit variation
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
+?>
+--FILE--
+<?php
+
+$values =[
+    3.0,
+    3.5,
+    10e120,
+    10e300,
+    fdiv(0, 0),
+    (string) 3.0,
+    (string) 3.5,
+    (string) 10e120,
+    (string) 10e300,
+    (string) fdiv(0, 0),
+];
+
+foreach($values as $value) {
+    var_dump((int) $value);
+}
+
+?>
+--EXPECT--
+int(3)
+int(3)
+int(0)
+int(0)
+int(0)
+int(3)
+int(3)
+int(2147483647)
+int(2147483647)
+int(0)

Zend/tests/float_to_int/negative_zero_check.phpt

@@ -0,0 +1,15 @@
+--TEST--
+Negative 0 check
+--FILE--
+<?php
+
+$negativeZero = -0.0;
+var_dump($negativeZero);
+var_dump($negativeZero === (float)(int)$negativeZero);
+var_dump($negativeZero === 0.0);
+
+?>
+--EXPECT--
+float(-0)
+bool(true)
+bool(true)