checker: allow none to be passed to ?T param (fix #23381) (#23385)

vlang · Jan 6, 2025 · 2aa5651 · 2aa5651
1 parent 8ec8cf0
commit 2aa5651
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/vlib/v/checker/fn.v b/vlib/v/checker/fn.v
@@ -1531,7 +1531,7 @@ fn (mut c Checker) fn_call(mut node ast.CallExpr, mut continue_check &bool) ast.
 			}
 		}
 		arg_typ_sym := c.table.sym(arg_typ)
-		if arg_typ_sym.kind == .none && param.typ.has_flag(.generic) {
+		if arg_typ_sym.kind == .none && param.typ.has_flag(.generic) && !param.typ.has_flag(.option) {
 			c.error('cannot use `none` as generic argument', call_arg.pos)
 		}
 		param_typ_sym := c.table.sym(param.typ)
@@ -2546,7 +2546,8 @@ fn (mut c Checker) method_call(mut node ast.CallExpr, mut continue_check &bool)
 			}
 			continue
 		}
-		if final_arg_sym.kind == .none && param.typ.has_flag(.generic) {
+		if final_arg_sym.kind == .none && param.typ.has_flag(.generic)
+			&& !param.typ.has_flag(.option) {
 			c.error('cannot use `none` as generic argument', arg.pos)
 		}
 		if param.typ.is_ptr() && !arg.typ.is_any_kind_of_pointer() && arg.expr.is_literal()

diff --git a/vlib/v/tests/fn_generic_option_none_test.v b/vlib/v/tests/fn_generic_option_none_test.v
@@ -0,0 +1,6 @@
+fn test[T](x T, b ?T) {
+}
+
+fn test_main() {
+	test[int](123, none)
+}