From ad1ef6a9e23594cba055812c521ecc4c08801c01 Mon Sep 17 00:00:00 2001
From: yuyi <yuyi98@163.com>
Date: Thu, 23 Dec 2021 19:04:36 +0800
Subject: [PATCH] cgen: fix map get assign blank var with optional (#12943)

---
 vlib/v/gen/c/assign.v                    |  2 +-
 vlib/v/tests/map_get_assign_blank_test.v | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/vlib/v/gen/c/assign.v b/vlib/v/gen/c/assign.v
index ac4329d8d2..0118642628 100644
--- a/vlib/v/gen/c/assign.v
+++ b/vlib/v/gen/c/assign.v
@@ -197,6 +197,7 @@ fn (mut g Gen) gen_assign_stmt(node ast.AssignStmt) {
 			if val is ast.IndexExpr {
 				g.assign_op = .decl_assign
 			}
+			g.is_assign_lhs = false
 			if is_call {
 				old_is_void_expr_stmt := g.is_void_expr_stmt
 				g.is_void_expr_stmt = true
@@ -209,7 +210,6 @@ fn (mut g Gen) gen_assign_stmt(node ast.AssignStmt) {
 				g.expr(val)
 				g.writeln(';}')
 			}
-			g.is_assign_lhs = false
 		} else if node.op == .assign
 			&& (is_fixed_array_init || (right_sym.kind == .array_fixed && val is ast.Ident)) {
 			mut v_var := ''
diff --git a/vlib/v/tests/map_get_assign_blank_test.v b/vlib/v/tests/map_get_assign_blank_test.v
index 12be778695..01088ca652 100644
--- a/vlib/v/tests/map_get_assign_blank_test.v
+++ b/vlib/v/tests/map_get_assign_blank_test.v
@@ -17,3 +17,16 @@ fn test_map_get_assign_blank() {
 	}
 	assert true
 }
+
+fn get_value() int {
+	mut m := map[string]int{}
+	_ := m['a'] or { return 1 }
+	println('a')
+	return 0
+}
+
+fn test_map_get_assign_blank_with_or_expr() {
+	ret := get_value()
+	println(ret)
+	assert ret == 1
+}