cgen: fix codegen for option return unwrapping on last statement (fix #24026) (#24030)

felipensp · web-flow · commit 42538e19ae8f · 2025-03-24T15:44:04.000+02:00
diff --git a/vlib/v/parser/parser.v b/vlib/v/parser/parser.v
@@ -601,6 +601,20 @@ fn (mut p Parser) mark_last_call_return_as_used(mut last_stmt ast.Stmt) {
 						}
 					}
 				}
+				ast.InfixExpr {
+					// last stmt has infix expr with CallExpr: foo()? + 'a'
+					mut left_expr := last_stmt.expr.left
+					for {
+						if mut left_expr is ast.InfixExpr {
+							left_expr = left_expr.left
+							continue
+						}
+						if mut left_expr is ast.CallExpr {
+							left_expr.is_return_used = true
+						}
+						break
+					}
+				}
 				else {}
 			}
 		}
diff --git a/vlib/v/tests/options/option_last_call_test.v b/vlib/v/tests/options/option_last_call_test.v
@@ -0,0 +1,16 @@
+fn test_main() {
+	assert some_func2(14)? + 'c' == 'aabcac'
+}
+
+fn some_func(i int) ?string {
+	return 'a'
+}
+
+fn some_func2(i int) ?string {
+	return match i {
+		12 { some_func(1)? + 'b' }
+		13 { some_func(1)? + 'b' + 'c' }
+		14 { 'a' + some_func(1)? + 'b' + 'c' + some_func(1)? }
+		else { none }
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -601,6 +601,20 @@ fn (mut p Parser) mark_last_call_return_as_used(mut last_stmt ast.Stmt) {`
`601`	`601`	`}`
`602`	`602`	`}`
`603`	`603`	`}`
	`604`	`+ ast.InfixExpr {`
	`605`	`+ // last stmt has infix expr with CallExpr: foo()? + 'a'`
	`606`	`+ mut left_expr := last_stmt.expr.left`
	`607`	`+ for {`
	`608`	`+ if mut left_expr is ast.InfixExpr {`
	`609`	`+ left_expr = left_expr.left`
	`610`	`+ continue`
	`611`	`+ }`
	`612`	`+ if mut left_expr is ast.CallExpr {`
	`613`	`+ left_expr.is_return_used = true`
	`614`	`+ }`
	`615`	`+ break`
	`616`	`+ }`
	`617`	`+ }`
`604`	`618`	`else {}`
`605`	`619`	`}`
`606`	`620`	`}`