From c3ec5323f0b3067257876271d8cd7bdbf4c9faf3 Mon Sep 17 00:00:00 2001
From: Alexander Medvednikov <alexander@vlang.io>
Date: Tue, 14 Jul 2020 15:30:55 +0200
Subject: [PATCH] autofree: move new scope free behind -experimental for now

---
 vlib/v/gen/cgen.v | 2 +-
 vlib/v/gen/fn.v   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/vlib/v/gen/cgen.v b/vlib/v/gen/cgen.v
index 91ef74dc4f..65e016ceb1 100644
--- a/vlib/v/gen/cgen.v
+++ b/vlib/v/gen/cgen.v
@@ -622,7 +622,7 @@ fn (mut g Gen) stmts(stmts []ast.Stmt) {
 		g.write('')
 		g.write(')')
 	}
-	if g.pref.autofree && stmts.len > 0 {
+	if g.pref.autofree && g.pref.experimental && stmts.len > 0 {
 		stmt := stmts[stmts.len - 1]
 		if stmt !is ast.FnDecl {
 			// g.writeln('// autofree scope')
diff --git a/vlib/v/gen/fn.v b/vlib/v/gen/fn.v
index 021969ec8a..f54eb20cee 100644
--- a/vlib/v/gen/fn.v
+++ b/vlib/v/gen/fn.v
@@ -140,10 +140,10 @@ fn (mut g Gen) gen_fn_decl(it ast.FnDecl) {
 		g.write_defer_stmts_when_needed()
 	}
 	// /////////
-	// if g.autofree {
-	// TODO: remove this, when g.write_autofree_stmts_when_needed works properly
-	// g.autofree_scope_vars(it.body_pos.pos)
-	// }
+	if g.autofree && !g.pref.experimental {
+		// TODO: remove this, when g.write_autofree_stmts_when_needed works properly
+		g.autofree_scope_vars(it.body_pos.pos)
+	}
 	g.writeln('}')
 	g.defer_stmts = []
 	if g.pref.printfn_list.len > 0 && g.last_fn_c_name in g.pref.printfn_list {