cgen: fix codegen for handling multiple return result type on call (fix #24341) (#24344)

felipensp · web-flow · commit 19be2283f0be · 2025-04-28T04:13:07.000+03:00
diff --git a/vlib/v/gen/c/fn.v b/vlib/v/gen/c/fn.v
@@ -1048,7 +1048,7 @@ fn (mut g Gen) call_expr(node ast.CallExpr) {
 					g.write('\n ${cur_line}')
 				}
 			} else {
-				if !g.inside_or_block && g.last_tmp_call_var.len > 0 {
+				if !g.inside_or_block && g.last_tmp_call_var.len > 0 && !cur_line.contains(' = ') {
 					g.write('\n\t*(${unwrapped_styp}*)${g.last_tmp_call_var.pop()}.data = ${cur_line}(*(${unwrapped_styp}*)${tmp_opt}.data)')
 				} else {
 					g.write('\n ${cur_line}(*(${unwrapped_styp}*)${tmp_opt}.data)')
diff --git a/vlib/v/tests/fns/call_result_test.v b/vlib/v/tests/fns/call_result_test.v
@@ -0,0 +1,27 @@
+module main
+
+const x = c(c(c('123') or { '456' }) or { '444' }) or { 'xx' }
+
+fn a(s string) ?string {
+	if s == 'b' {
+		return 'a'
+	} else {
+		return none
+	}
+}
+
+fn b(s string) ?string {
+	if s == 'a' {
+		return 'b'
+	} else {
+		return none
+	}
+}
+
+fn c(s string) !string {
+	return a(s) or { b(s) or { 'c' } }
+}
+
+fn test_main() {
+	assert x == 'c'
+}

Original file line number	Diff line number	Diff line change
`@@ -1048,7 +1048,7 @@ fn (mut g Gen) call_expr(node ast.CallExpr) {`
`1048`	`1048`	`g.write('\n ${cur_line}')`
`1049`	`1049`	`}`
`1050`	`1050`	`} else {`
`1051`		`- if !g.inside_or_block && g.last_tmp_call_var.len > 0 {`
	`1051`	`+ if !g.inside_or_block && g.last_tmp_call_var.len > 0 && !cur_line.contains(' = ') {`
`1052`	`1052`	`g.write('\n\t(${unwrapped_styp})${g.last_tmp_call_var.pop()}.data = ${cur_line}((${unwrapped_styp})${tmp_opt}.data)')`
`1053`	`1053`	`} else {`
`1054`	`1054`	`g.write('\n ${cur_line}((${unwrapped_styp})${tmp_opt}.data)')`