Add is_long_compatible func

Author: Girgias

Zend/Optimizer/sccp.c

@@ -426,7 +426,7 @@ static inline int fetch_array_elem(zval **result, zval *op1, zval *op2) {
 			*result = zend_hash_index_find(Z_ARR_P(op1), Z_LVAL_P(op2));
 			return SUCCESS;
 		case IS_DOUBLE:
-			if ((double)(zend_long) Z_DVAL_P(op2) != Z_DVAL_P(op2)) {
+			if (!is_long_compatible(Z_DVAL_P(op2))) {
 				return FAILURE;
 			}
 			*result = zend_hash_index_find(Z_ARR_P(op1), zend_dval_to_lval(Z_DVAL_P(op2)));
@@ -512,7 +512,7 @@ static inline int ct_eval_del_array_elem(zval *result, zval *key) {
 			zend_hash_index_del(Z_ARR_P(result), Z_LVAL_P(key));
 			break;
 		case IS_DOUBLE:
-			if ((double)(zend_long) Z_DVAL_P(key) != Z_DVAL_P(key)) {
+			if (!is_long_compatible(Z_DVAL_P(key))) {
 				return FAILURE;
 			}
 			zend_hash_index_del(Z_ARR_P(result), zend_dval_to_lval(Z_DVAL_P(key)));
@@ -556,7 +556,7 @@ static inline int ct_eval_add_array_elem(zval *result, zval *value, zval *key) {
 			break;
 		case IS_DOUBLE:
 			SEPARATE_ARRAY(result);
-			if ((double)(zend_long) Z_DVAL_P(key) != Z_DVAL_P(key)) {
+			if (!is_long_compatible(Z_DVAL_P(key))) {
 				return FAILURE;
 			}
 			value = zend_hash_index_update(

Zend/zend_API.c

@@ -504,7 +504,7 @@ ZEND_API bool ZEND_FASTCALL zend_parse_arg_long_weak(zval *arg, zend_long *dest,
 
 				/* This only checks for a fractional part as if doesn't fit it already throws a TypeError
 				 * Manually check to get correct warning text mentioning string origin */
-				if ((double)(zend_long) d != d) {
+				if (!is_long_compatible(d)) {
 					zend_error(E_WARNING, "Implicit float string to int conversion");
 				}
 				*dest = zend_dval_to_lval(d);

Zend/zend_operators.c

@@ -818,7 +818,7 @@ ZEND_API zend_long ZEND_FASTCALL zval_get_long_func(zval *op, bool is_lax) /* {{
 					 */
 					 /* For (int) casts */
 					 if (UNEXPECTED(is_lax)) {
-					 	return zend_dval_to_lval_cap(dval);
+						return zend_dval_to_lval_cap(dval);
 					 }
 					 return zend_dval_to_lval_cap_safe(dval);
 				}

Zend/zend_operators.h

@@ -134,16 +134,20 @@ static zend_always_inline zend_long zend_dval_to_lval_cap(double d)
 }
 /* }}} */
 
+static zend_always_inline bool is_long_compatible(double d) {
+	return ((double)(zend_long) d == d);
+}
+
 static zend_always_inline zend_long zend_dval_to_lval_safe(double d)
 {
-	if ((double)(zend_long) d != d) {
+	if (!is_long_compatible(d)) {
 		zend_error(E_WARNING, "Implicit float to int conversion");
 	}
 	return zend_dval_to_lval(d);
 }
 static zend_always_inline zend_long zend_dval_to_lval_cap_safe(double d)
 {
-	if ((double)(zend_long) d != d) {
+	if (!is_long_compatible(d)) {
 		zend_error(E_WARNING, "Implicit float string to int conversion");
 	}
 	if (UNEXPECTED(!zend_finite(d)) || UNEXPECTED(zend_isnan(d))) {