cgen: fix comptimecall with map receiver (fix #24448) (#24449)

felipensp · web-flow · commit d0de08338f89 · 2025-05-10T21:03:11.000+03:00
diff --git a/vlib/v/gen/c/comptime.v b/vlib/v/gen/c/comptime.v
@@ -139,7 +139,8 @@ fn (mut g Gen) comptime_call(mut node ast.ComptimeCall) {
 		}
 		return
 	}
-	sym := g.table.sym(g.unwrap_generic(node.left_type))
+	left_type := g.unwrap_generic(node.left_type)
+	sym := g.table.sym(left_type)
 	g.trace_autofree('// \$method call. sym="${sym.name}"')
 	if node.method_name == 'method' {
 		// `app.$method()`
@@ -187,7 +188,7 @@ fn (mut g Gen) comptime_call(mut node ast.ComptimeCall) {
 			}
 		}
 		// TODO: check argument types
-		g.write('${util.no_dots(sym.name)}_${g.comptime.comptime_for_method.name}(')
+		g.write('${g.cc_type(left_type, false)}_${g.comptime.comptime_for_method.name}(')
 
 		// try to see if we need to pass a pointer
 		if mut node.left is ast.Ident {
@@ -279,7 +280,7 @@ fn (mut g Gen) comptime_call(mut node ast.ComptimeCall) {
 			}
 			g.write('if (string__eq(${node.method_name}, _SLIT("${method.name}"))) ')
 		}
-		g.write('${util.no_dots(sym.name)}_${method.name}(${amp} ')
+		g.write('${g.cc_type(left_type, false)}_${method.name}(${amp} ')
 		g.expr(node.left)
 		g.writeln(');')
 		j++
diff --git a/vlib/v/tests/comptime/comptime_call_map_receiver_test.v b/vlib/v/tests/comptime/comptime_call_map_receiver_test.v
@@ -0,0 +1,26 @@
+type Any = string | int
+
+fn (m map[string]Any) to_toml() string {
+	mut t := ''
+	return t
+}
+
+fn test_main() {
+	mut doc := map[string]Any{}
+	_ := encode(doc)
+}
+
+fn encode[T](typ T) string {
+	$for method in T.methods {
+		$if method.name == 'to_toml' {
+			return typ.$method()
+		}
+	}
+	mp := encode_struct[T](typ)
+	return mp.to_toml()
+}
+
+fn encode_struct[T](typ T) map[string]Any {
+	mut mp := map[string]Any{}
+	return mp
+}

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,8 @@ fn (mut g Gen) comptime_call(mut node ast.ComptimeCall) {`
`139`	`139`	`}`
`140`	`140`	`return`
`141`	`141`	`}`
`142`		`- sym := g.table.sym(g.unwrap_generic(node.left_type))`
	`142`	`+ left_type := g.unwrap_generic(node.left_type)`
	`143`	`+ sym := g.table.sym(left_type)`
`143`	`144`	`g.trace_autofree('// \$method call. sym="${sym.name}"')`
`144`	`145`	`if node.method_name == 'method' {`
`145`	`146`	// `app.$method()`
`@@ -187,7 +188,7 @@ fn (mut g Gen) comptime_call(mut node ast.ComptimeCall) {`
`187`	`188`	`}`
`188`	`189`	`}`
`189`	`190`	`// TODO: check argument types`
`190`		`- g.write('${util.no_dots(sym.name)}_${g.comptime.comptime_for_method.name}(')`
	`191`	`+ g.write('${g.cc_type(left_type, false)}_${g.comptime.comptime_for_method.name}(')`
`191`	`192`
`192`	`193`	`// try to see if we need to pass a pointer`
`193`	`194`	`if mut node.left is ast.Ident {`
`@@ -279,7 +280,7 @@ fn (mut g Gen) comptime_call(mut node ast.ComptimeCall) {`
`279`	`280`	`}`
`280`	`281`	`g.write('if (string__eq(${node.method_name}, _SLIT("${method.name}"))) ')`
`281`	`282`	`}`
`282`		`- g.write('${util.no_dots(sym.name)}_${method.name}(${amp} ')`
	`283`	`+ g.write('${g.cc_type(left_type, false)}_${method.name}(${amp} ')`
`283`	`284`	`g.expr(node.left)`
`284`	`285`	`g.writeln(');')`
`285`	`286`	`j++`