From 612fe1b8fbed60f6d8701ad13a40e753e42c8f24 Mon Sep 17 00:00:00 2001
From: joe-conigliaro <joe@vlang.io>
Date: Thu, 16 Jul 2020 20:06:50 +1000
Subject: [PATCH] cgen: autofree scope var position fixes

---
 vlib/v/gen/cgen.v | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/vlib/v/gen/cgen.v b/vlib/v/gen/cgen.v
index 097d73b0e6..0157397d74 100644
--- a/vlib/v/gen/cgen.v
+++ b/vlib/v/gen/cgen.v
@@ -622,11 +622,16 @@ fn (mut g Gen) stmts(stmts []ast.Stmt) {
 		g.write('')
 		g.write(')')
 	}
-	if g.pref.autofree && g.pref.experimental && stmts.len > 0 {
-		stmt := stmts[stmts.len - 1]
+	if g.pref.autofree && g.pref.experimental && !g.inside_vweb_tmpl && stmts.len > 0 {
+		// use the first stmt to get the scope
+		stmt := stmts[0]
+		// stmt := stmts[stmts.len-1]
 		if stmt !is ast.FnDecl {
 			// g.writeln('// autofree scope')
-			g.autofree_scope_vars(stmt.position().pos)
+			// g.writeln('// autofree_scope_vars($stmt.position().pos) | ${typeof(stmt)}')
+			// go back 1 position is important so we dont get the 
+			// internal scope of for loops and possibly other nodes
+			g.autofree_scope_vars(stmt.position().pos-1)
 		}
 	}
 }
@@ -1586,9 +1591,9 @@ fn (g &Gen) autofree_var_call(free_fn_name string, v ast.Var) {
 		return
 	}
 	if v.typ.is_ptr() {
-		g.writeln('\t${free_fn_name}($v.name); // autofreed ptr var')
+		g.writeln('\t${free_fn_name}(${c_name(v.name)}); // autofreed ptr var')
 	} else {
-		g.writeln('\t${free_fn_name}(&$v.name); // autofreed var')
+		g.writeln('\t${free_fn_name}(&${c_name(v.name)}); // autofreed var')
 	}
 }