wip

Author: ndossche

Zend/zend_API.c

@@ -585,7 +585,6 @@ ZEND_API zend_opt_long ZEND_FASTCALL zend_parse_arg_long_weak(const zval *arg, u
 				}
 			}
 			result.value = lval;
-			result.has_value = true;
 		}
 	} else if (EXPECTED(Z_TYPE_P(arg) == IS_STRING)) {
 		double d;
@@ -614,27 +613,22 @@ ZEND_API zend_opt_long ZEND_FASTCALL zend_parse_arg_long_weak(const zval *arg, u
 					}
 				}
 				result.value = lval;
-				result.has_value = true;
 			} else {
 				return result;
 			}
-		} else {
-			result.has_value = true;
 		}
 		if (UNEXPECTED(EG(exception))) {
-			result.has_value = false;
 			return result;
 		}
 	} else if (EXPECTED(Z_TYPE_P(arg) < IS_TRUE)) {
 		if (UNEXPECTED(Z_TYPE_P(arg) == IS_NULL) && !zend_null_arg_deprecated("int", arg_num)) {
 			return result;
 		}
 		result.value = 0;
-		result.has_value = true;
 	} else if (EXPECTED(Z_TYPE_P(arg) == IS_TRUE)) {
 		result.value = 1;
-		result.has_value = true;
 	}
+	result.has_value = true;
 	return result;
 }
 /* }}} */

Zend/zend_execute.c

@@ -723,14 +723,13 @@ ZEND_API ZEND_COLD void zend_verify_arg_error(
 
 static bool zend_verify_weak_scalar_type_hint(uint32_t type_mask, zval *arg)
 {
-	zend_long lval;
-	double dval;
-
 	/* Type preference order: int -> float -> string -> bool */
 	if (type_mask & MAY_BE_LONG) {
 		/* For an int|float union type and string value,
 		 * determine chosen type by is_numeric_string() semantics. */
 		if ((type_mask & MAY_BE_DOUBLE) && Z_TYPE_P(arg) == IS_STRING) {
+			zend_long lval;
+			double dval;
 			uint8_t type = is_numeric_str_function(Z_STR_P(arg), &lval, &dval);
 			if (type == IS_LONG) {
 				zend_string_release(Z_STR_P(arg));

Zend/zend_vm_def.h

@@ -5507,7 +5507,7 @@ ZEND_VM_C_LABEL(send_array):
 			} else if (Z_TYPE_P(op2) == IS_NULL) {
 				len = count - skip;
 			} else if (EX_USES_STRICT_TYPES()
-						|| !(result = zend_parse_arg_long_weak(op2, /* arg_num */ 3)).has_value) {
+					|| !(result = zend_parse_arg_long_weak(op2, /* arg_num */ 3)).has_value) {
 				zend_type_error(
 					"array_slice(): Argument #3 ($length) must be of type ?int, %s given",
 					zend_zval_value_name(op2));