generics: fix generic_struct_insts_to_concrete (#9536)

vlib/v/table/table.v

@@ -1093,19 +1093,13 @@ pub fn (mut t Table) generic_struct_insts_to_concrete() {
 			}
 			mut parent_info := parent.info as Struct
 			mut fields := parent_info.fields.clone()
+			if parent_info.generic_types.len == info.generic_types.len {
 				for i, _ in fields {
 					mut field := fields[i]
-				if field.typ.has_flag(.generic) {
+					if t_typ := t.resolve_generic_by_types(field.typ, parent_info.generic_types,
-					if parent_info.generic_types.len != info.generic_types.len {
+						info.generic_types)
-						// TODO: proper error
+					{
-						panic('generic template mismatch')
+						field.typ = t_typ
-					}
-					for j, gp in parent_info.generic_types {
-						if gp == field.typ {
-							field.typ = info.generic_types[j].derive(field.typ).clear_flag(.generic)
-							break
-						}
-					}
 					}
 					fields[i] = field
 				}
@@ -1116,4 +1110,5 @@ pub fn (mut t Table) generic_struct_insts_to_concrete() {
 				typ.info = parent_info
 			}
 		}
+	}
 }

vlib/v/tests/generics_return_generics_struct_test.v

@@ -49,3 +49,15 @@ fn test_generics_with_generics_struct_string() {
 	assert ret.contains("data: ['foo', 'bar']")
 	assert ret.contains('index: 11')
 }
+
+fn test_generics_struct_insts_to_concrete() {
+	ai := ArrayIterator<int>{
+		data: [11, 22],
+		index: 22
+	}
+	println(ai)
+	ret := '$ai'
+	assert ret.contains('ArrayIterator<int>{')
+	assert ret.contains('data: [11, 22]')
+	assert ret.contains('index: 22')
+}