From 97e999768a453bf827edc9cfa4d4d96f7cdf87e3 Mon Sep 17 00:00:00 2001
From: yuyi <yuyi98@163.com>
Date: Thu, 14 Oct 2021 02:21:32 +0800
Subject: [PATCH] checker: fix generic fn return array of generic struct
 (#12170)

---
 vlib/v/checker/checker.v                           | 14 ++++++++++++++
 ...nerics_fn_return_array_of_generic_struct_test.v | 12 ++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 vlib/v/tests/generics_fn_return_array_of_generic_struct_test.v

diff --git a/vlib/v/checker/checker.v b/vlib/v/checker/checker.v
index fd1d29d836..ab3b1f62a2 100644
--- a/vlib/v/checker/checker.v
+++ b/vlib/v/checker/checker.v
@@ -685,6 +685,20 @@ fn (mut c Checker) unwrap_generic_type(typ ast.Type, generic_names []string, con
 	mut c_nrt := ''
 	ts := c.table.get_type_symbol(typ)
 	match mut ts.info {
+		ast.Array {
+			mut elem_type := ts.info.elem_type
+			mut elem_sym := c.table.get_type_symbol(elem_type)
+			mut dims := 1
+			for mut elem_sym.info is ast.Array {
+				info := elem_sym.info as ast.Array
+				elem_type = info.elem_type
+				elem_sym = c.table.get_type_symbol(elem_type)
+				dims++
+			}
+			unwrap_typ := c.unwrap_generic_type(elem_type, generic_names, concrete_types)
+			idx := c.table.find_or_register_array_with_dims(unwrap_typ, dims)
+			return ast.new_type(idx).derive_add_muls(typ).clear_flag(.generic)
+		}
 		ast.Struct, ast.Interface, ast.SumType {
 			if !ts.info.is_generic {
 				return typ
diff --git a/vlib/v/tests/generics_fn_return_array_of_generic_struct_test.v b/vlib/v/tests/generics_fn_return_array_of_generic_struct_test.v
new file mode 100644
index 0000000000..bf7e4ddae9
--- /dev/null
+++ b/vlib/v/tests/generics_fn_return_array_of_generic_struct_test.v
@@ -0,0 +1,12 @@
+pub struct Abcd<T> {
+}
+
+pub fn iterators<T>() []&Abcd<T> {
+	return []&Abcd<T>{}
+}
+
+fn test_generic_fn_return_array_of_generic_struct() {
+	a := iterators<f64>()
+	println(a)
+	assert '$a' == '[]'
+}