Some fixes

Namely if deprecation notices are promoted to Exception due to an error handeler

Author: Girgias

Zend/tests/float_to_int/warnings_string_float_literals.phpt

@@ -71,12 +71,6 @@ Deprecated: Implicit conversion to int from non-compatible float-string in %s on
 
 Deprecated: Implicit conversion to int from non-compatible float-string in %s on line %d
 
-Deprecated: Implicit conversion to int from non-compatible float-string in %s on line %d
-
-Deprecated: Implicit conversion to int from non-compatible float-string in %s on line %d
-
-Deprecated: Implicit conversion to int from non-compatible float-string in %s on line %d
-
 Deprecated: Implicit conversion to int from non-compatible float-string in %s on line %d
 Bitwise ops:
 int(3)

Zend/zend_compile.c

@@ -8144,12 +8144,12 @@ ZEND_API bool zend_binary_op_produces_error(uint32_t opcode, zval *op1, zval *op
 		return 1;
 	}
 
-	if ((opcode == ZEND_MOD && zval_get_long(op2) == 0)
+	if ((opcode == ZEND_MOD && zval_get_long_func(op2, /* lax */ true) == 0)
 			|| (opcode == ZEND_DIV && zval_get_double(op2) == 0.0)) {
 		/* Division by zero throws an error. */
 		return 1;
 	}
-	if ((opcode == ZEND_SL || opcode == ZEND_SR) && zval_get_long(op2) < 0) {
+	if ((opcode == ZEND_SL || opcode == ZEND_SR) && zval_get_long_func(op2, /* lax */ true) < 0) {
 		/* Shift by negative number throws an error. */
 		return 1;
 	}

Zend/zend_operators.c

@@ -304,7 +304,13 @@ static zend_never_inline zend_long ZEND_FASTCALL zendi_try_get_long(zval *op, bo
 		case IS_TRUE:
 			return 1;
 		case IS_DOUBLE:
-			return zend_dval_to_lval_safe(Z_DVAL_P(op));
+			if (!is_long_compatible(Z_DVAL_P(op))) {
+				zend_error(E_DEPRECATED, "Implicit conversion to int from non-compatible float");
+				if (UNEXPECTED(EG(exception))) {
+					*failed = 1;
+				}
+			}
+			return zend_dval_to_lval(Z_DVAL_P(op));
 		case IS_STRING:
 			{
 				zend_uchar type;
@@ -333,7 +339,13 @@ static zend_never_inline zend_long ZEND_FASTCALL zendi_try_get_long(zval *op, bo
 					 * We use use saturating conversion to emulate strtol()'s
 					 * behaviour.
 					 */
-					return zend_dval_to_lval_cap_safe(dval);
+					if (!is_long_compatible(dval)) {
+						zend_error(E_DEPRECATED, "Implicit conversion to int from non-compatible float-string");
+						if (UNEXPECTED(EG(exception))) {
+							*failed = 1;
+						}
+					}
+					return zend_dval_to_lval_cap(dval);
 				}
 			}
 		case IS_OBJECT:
@@ -452,6 +464,7 @@ ZEND_API void ZEND_FASTCALL convert_to_long(zval *op) /* {{{ */
 		case IS_LONG:
 			break;
 		case IS_DOUBLE:
+			// TODO Use safe variant?
 			ZVAL_LONG(op, zend_dval_to_lval(Z_DVAL_P(op)));
 			break;
 		case IS_STRING:
@@ -807,6 +820,13 @@ ZEND_API zend_long ZEND_FASTCALL zval_get_long_func(zval *op, bool is_lax) /* {{
 		case IS_LONG:
 			return Z_LVAL_P(op);
 		case IS_DOUBLE:
+			if (EXPECTED(!is_lax)) {
+				if (!is_long_compatible(Z_DVAL_P(op))) {
+					zend_error(E_DEPRECATED, "Implicit conversion to int from non-compatible float");
+					// TODO Need to handle this here?
+					//if (UNEXPECTED(EG(exception))) {}
+				}
+			}
 			return zend_dval_to_lval(Z_DVAL_P(op));
 		case IS_STRING:
 			{
@@ -823,11 +843,15 @@ ZEND_API zend_long ZEND_FASTCALL zval_get_long_func(zval *op, bool is_lax) /* {{
 					 * We use saturating conversion to emulate strtol()'s
 					 * behaviour.
 					 */
-					 /* For (int) casts */
-					 if (UNEXPECTED(is_lax)) {
-						return zend_dval_to_lval_cap(dval);
-					 }
-					 return zend_dval_to_lval_cap_safe(dval);
+					 /* Most usages are expected to not be (int) casts */
+					if (EXPECTED(!is_lax)) {
+						if (!is_long_compatible(dval)) {
+							zend_error(E_DEPRECATED, "Implicit conversion to int from non-compatible float-string");
+							// TODO Need to handle this here?
+							//if (UNEXPECTED(EG(exception))) {}
+						}
+					}
+					return zend_dval_to_lval_cap(dval);
 				}
 			}
 		case IS_ARRAY:
@@ -1460,6 +1484,7 @@ ZEND_API zend_result ZEND_FASTCALL bitwise_not_function(zval *result, zval *op1)
 			ZVAL_LONG(result, ~Z_LVAL_P(op1));
 			return SUCCESS;
 		case IS_DOUBLE:
+			// TODO Handle manually in case deprecation notice promoted to Exception?
 			ZVAL_LONG(result, ~zend_dval_to_lval_safe(Z_DVAL_P(op1)));
 			return SUCCESS;
 		case IS_STRING: {

Zend/zend_operators.h

@@ -145,18 +145,6 @@ static zend_always_inline zend_long zend_dval_to_lval_safe(double d)
 	}
 	return zend_dval_to_lval(d);
 }
-static zend_always_inline zend_long zend_dval_to_lval_cap_safe(double d)
-{
-	if (!is_long_compatible(d)) {
-		zend_error(E_DEPRECATED, "Implicit conversion to int from non-compatible float-string");
-	}
-	if (UNEXPECTED(!zend_finite(d)) || UNEXPECTED(zend_isnan(d))) {
-		return 0;
-	} else if (!ZEND_DOUBLE_FITS_LONG(d)) {
-		return (d > 0 ? ZEND_LONG_MAX : ZEND_LONG_MIN);
-	}
-	return (zend_long)d;
-}
 
 #define ZEND_IS_DIGIT(c) ((c) >= '0' && (c) <= '9')
 #define ZEND_IS_XDIGIT(c) (((c) >= 'A' && (c) <= 'F') || ((c) >= 'a' && (c) <= 'f'))