fix autofree

felipensp · Dec 29, 2024 · 21a5dc4 · 21a5dc4
1 parent 1f6af15
commit 21a5dc4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v
@@ -2718,8 +2718,9 @@ fn (mut g Gen) call_cfn_for_casting_expr(fname string, expr ast.Expr, exp_is_ptr
 	if got_styp == 'none' && !g.cur_fn.return_type.has_flag(.option) {
 		g.write('(none){EMPTY_STRUCT_INITIALIZATION}')
 	} else if is_comptime_variant {
-		g.write(g.type_default(g.type_resolver.get_ct_type_or_default('${g.comptime.comptime_for_variant_var}.typ',
-			ast.void_type)))
+		ctyp := g.type_resolver.get_ct_type_or_default('${g.comptime.comptime_for_variant_var}.typ',
+			ast.void_type)
+		g.write(g.type_default(ctyp))
 	} else {
 		g.expr(expr)
 	}

diff --git a/vlib/v/type_resolver/comptime_resolver.v b/vlib/v/type_resolver/comptime_resolver.v
@@ -111,16 +111,18 @@ pub fn (mut t TypeResolver) get_expr_type_or_default(node ast.Expr, default_typ
 // get_type_from_comptime_var retrives the comptime type related to $for variable
 @[inline]
 pub fn (t &TypeResolver) get_type_from_comptime_var(var ast.Ident) ast.Type {
-	return match var.name {
+	match var.name {
 		t.info.comptime_for_variant_var {
-			t.get_ct_type_or_default('${t.info.comptime_for_variant_var}.typ', ast.void_type)
+			return t.get_ct_type_or_default('${t.info.comptime_for_variant_var}.typ',
+				ast.void_type)
 		}
 		t.info.comptime_for_method_param_var {
-			t.get_ct_type_or_default('${t.info.comptime_for_method_param_var}.typ', ast.void_type)
+			return t.get_ct_type_or_default('${t.info.comptime_for_method_param_var}.typ',
+				ast.void_type)
 		}
 		else {
 			// field_var.typ from $for field
-			t.info.comptime_for_field_type
+			return t.info.comptime_for_field_type
 		}
 	}
 }