From 8627af18dd814808c530cba6f05de04e8c976aa7 Mon Sep 17 00:00:00 2001
From: yuyi <yuyi98@163.com>
Date: Wed, 7 Sep 2022 21:05:38 +0800
Subject: [PATCH] table: check sumtype of fntype assign error (#15685)

---
 vlib/v/ast/table.v                                |  9 ++++++++-
 .../tests/sumtype_of_fntype_assign_err.out        |  6 ++++++
 .../checker/tests/sumtype_of_fntype_assign_err.vv | 15 +++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 vlib/v/checker/tests/sumtype_of_fntype_assign_err.out
 create mode 100644 vlib/v/checker/tests/sumtype_of_fntype_assign_err.vv

diff --git a/vlib/v/ast/table.v b/vlib/v/ast/table.v
index 66012b625..604c852b9 100644
--- a/vlib/v/ast/table.v
+++ b/vlib/v/ast/table.v
@@ -1308,7 +1308,14 @@ pub fn (t &Table) sumtype_has_variant(parent Type, variant Type, is_as bool) boo
 
 fn (t &Table) sumtype_check_function_variant(parent_info SumType, variant Type, is_as bool) bool {
 	for v in parent_info.variants {
-		if '$v.idx' == '$variant.idx' && (!is_as || v.nr_muls() == variant.nr_muls()) {
+		v_sym := t.sym(v)
+		if v_sym.kind != .function {
+			continue
+		}
+		v_fn := (v_sym.info as FnType).func
+		variant_fn := (t.sym(variant).info as FnType).func
+		if t.fn_type_source_signature(v_fn) == t.fn_type_source_signature(variant_fn)
+			&& (!is_as || v.nr_muls() == variant.nr_muls()) {
 			return true
 		}
 	}
diff --git a/vlib/v/checker/tests/sumtype_of_fntype_assign_err.out b/vlib/v/checker/tests/sumtype_of_fntype_assign_err.out
new file mode 100644
index 000000000..286453791
--- /dev/null
+++ b/vlib/v/checker/tests/sumtype_of_fntype_assign_err.out
@@ -0,0 +1,6 @@
+vlib/v/checker/tests/sumtype_of_fntype_assign_err.vv:14:11: error: cannot assign to `m['f']`: expected `Expr`, not `fn () Expr`
+   12 |     mut m := map[string]Expr{}
+   13 |
+   14 |     m['f'] = f
+      |              ^
+   15 | }
diff --git a/vlib/v/checker/tests/sumtype_of_fntype_assign_err.vv b/vlib/v/checker/tests/sumtype_of_fntype_assign_err.vv
new file mode 100644
index 000000000..309b99412
--- /dev/null
+++ b/vlib/v/checker/tests/sumtype_of_fntype_assign_err.vv
@@ -0,0 +1,15 @@
+type Expr = fn (int) int | int
+
+fn id(n int) int {
+	return n
+}
+
+fn f() Expr {
+	return id
+}
+
+fn main() {
+	mut m := map[string]Expr{}
+
+	m['f'] = f
+}
-- 
2.39.5