test struct in-place with return

Author: ndossche

Zend/zend_API.c

@@ -658,36 +658,44 @@ ZEND_API zend_opt_long ZEND_FASTCALL zend_flf_parse_arg_long_slow(const zval *ar
 
 ZEND_API zend_opt_double ZEND_FASTCALL zend_parse_arg_double_weak(const zval *arg, uint32_t arg_num) /* {{{ */
 {
-	zend_opt_double result;
-	result.has_value = false;
 	if (EXPECTED(Z_TYPE_P(arg) == IS_LONG)) {
-		result.value = (double)Z_LVAL_P(arg);
+		return (zend_opt_double){(double)Z_LVAL_P(arg), true};
 	} else if (EXPECTED(Z_TYPE_P(arg) == IS_STRING)) {
 		zend_long l;
 		uint8_t type;
+		double d;
 
-		if (UNEXPECTED((type = is_numeric_str_function(Z_STR_P(arg), &l, &result.value)) != IS_DOUBLE)) {
+		if (UNEXPECTED((type = is_numeric_str_function(Z_STR_P(arg), &l, &d)) != IS_DOUBLE)) {
+			zend_opt_double result;
 			if (EXPECTED(type != 0)) {
 				result.value = (double)(l);
 				result.has_value = true;
+			} else {
+				result.has_value = false;
 			}
 			return result;
+		} else {
+			return (zend_opt_double){d, true};
 		}
 		if (UNEXPECTED(EG(exception))) {
+			zend_opt_double result;
+			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("float", arg_num)) {
+			zend_opt_double result;
+			result.has_value = false;
 			return result;
 		}
-		result.value = 0.0;
+		return (zend_opt_double){0.0, true};
 	} else if (EXPECTED(Z_TYPE_P(arg) == IS_TRUE)) {
-		result.value = 1.0;
+		return (zend_opt_double){1.0, true};
 	} else {
+		zend_opt_double result;
+		result.has_value = false;
 		return result;
 	}
-	result.has_value = true;
-	return result;
 }
 /* }}} */