all: make defer{} scoped by default, use defer(fn){} to get the old behavior (part 3 of #25639) (#25665)

StunxFS · web-flow · commit be82b0395efa · 2025-11-05T10:22:47.000+02:00
diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v
@@ -2656,7 +2656,7 @@ fn (mut g Gen) stmt(node ast.Stmt) {
 		ast.DeferStmt {
 			mut defer_stmt := node
 			defer_stmt.ifdef = g.defer_ifdef
-			if defer_stmt.mode == .function || !g.pref.scoped_defer {
+			if defer_stmt.mode == .function {
 				g.writeln('${g.defer_flag_var(defer_stmt)} = true;')
 			}
 			g.defer_stmts << defer_stmt
diff --git a/vlib/v/gen/c/defer.v b/vlib/v/gen/c/defer.v
@@ -26,8 +26,7 @@ fn (mut g Gen) write_defer_stmts(scope &ast.Scope, lookup bool, pos token.Pos) {
 			g.error('Gen.write_defer_stmts(): defer_stmt.scope is nil', pos)
 		}
 
-		is_scoped := g.pref.scoped_defer && defer_stmt.mode == .scoped
-		if is_scoped {
+		if defer_stmt.mode == .scoped {
 			if !((lookup && defer_stmt.scope.start_pos < scope.start_pos
 				&& defer_stmt.scope.end_pos > scope.end_pos)
 				|| defer_stmt.scope == scope) {
diff --git a/vlib/v/gen/c/fn.v b/vlib/v/gen/c/fn.v
@@ -454,7 +454,7 @@ fn (mut g Gen) gen_fn_decl(node &ast.FnDecl, skip bool) {
 	}
 	g.indent++
 	for defer_stmt in node.defer_stmts {
-		if defer_stmt.mode != .function && g.pref.scoped_defer {
+		if defer_stmt.mode != .function {
 			continue
 		}
 		g.writeln('bool ${g.defer_flag_var(defer_stmt)} = false;')
diff --git a/vlib/v/pref/pref.v b/vlib/v/pref/pref.v
@@ -260,8 +260,6 @@ pub mut:
 	subsystem   Subsystem // the type of the window app, that is going to be generated; has no effect on !windows
 	is_vls      bool
 	json_errors bool // -json-errors, for VLS and other tools
-
-	scoped_defer bool // experimental support, is activated with `-scoped-defer`
 }
 
 pub fn parse_args(known_external_commands []string, args []string) (&Preferences, string) {
@@ -764,10 +762,6 @@ pub fn parse_args_and_show_errors(known_external_commands []string, args []strin
 			'-experimental' {
 				res.experimental = true
 			}
-			'-scoped-defer' {
-				// experimental, remove once defer is scoped by default
-				res.scoped_defer = true
-			}
 			'-usecache' {
 				res.use_cache = true
 			}
diff --git a/vlib/v/tests/defer/defer_fixed_array_test.v b/vlib/v/tests/defer/defer_fixed_array_test.v
@@ -1,5 +1,3 @@
-// vtest vflags: -scoped-defer
-
 fn foo() {
 	a := [u8(1), 2, 3]!
 	defer {
diff --git a/vlib/v/tests/defer/defer_if_comptime_test.v b/vlib/v/tests/defer/defer_if_comptime_test.v
@@ -1,5 +1,3 @@
-// vtest vflags: -scoped-defer
-
 fn test_main() {
 	defer {
 		$if foo ? {
diff --git a/vlib/v/tests/defer/defer_return_test.v b/vlib/v/tests/defer/defer_return_test.v
@@ -1,5 +1,3 @@
-// vtest vflags: -scoped-defer
-
 @[heap]
 struct Hwe {
 mut:
diff --git a/vlib/v/tests/defer/defer_static_test.v b/vlib/v/tests/defer/defer_static_test.v
@@ -1,5 +1,3 @@
-// vtest vflags: -scoped-defer
-
 @[unsafe]
 fn g() {
 	mut static levels := 0
diff --git a/vlib/v/tests/defer/defer_test.v b/vlib/v/tests/defer/defer_test.v
@@ -1,5 +1,3 @@
-// vtest vflags: -scoped-defer
-
 fn foo() string {
 	println('foo()')
 	return 'foo'
diff --git a/vlib/v/tests/defer/defer_use_returned_value_test.v b/vlib/v/tests/defer/defer_use_returned_value_test.v
@@ -1,5 +1,3 @@
-// vtest vflags: -scoped-defer
-
 struct Test {
 mut:
 	a int
diff --git a/vlib/v/tests/defer/defer_with_fn_var_test.v b/vlib/v/tests/defer/defer_with_fn_var_test.v
@@ -1,5 +1,3 @@
-// vtest vflags: -scoped-defer
-
 @[has_globals]
 module main
 
diff --git a/vlib/v/tests/defer/scoped_defer_test.v b/vlib/v/tests/defer/scoped_defer_test.v
@@ -1,5 +1,3 @@
-// vtest vflags: -scoped-defer
-
 struct Data {
 mut:
 	counter int

Original file line number	Diff line number	Diff line change
`@@ -2656,7 +2656,7 @@ fn (mut g Gen) stmt(node ast.Stmt) {`
`2656`	`2656`	`ast.DeferStmt {`
`2657`	`2657`	`mut defer_stmt := node`
`2658`	`2658`	`defer_stmt.ifdef = g.defer_ifdef`
`2659`		`- if defer_stmt.mode == .function \|\| !g.pref.scoped_defer {`
	`2659`	`+ if defer_stmt.mode == .function {`
`2660`	`2660`	`g.writeln('${g.defer_flag_var(defer_stmt)} = true;')`
`2661`	`2661`	`}`
`2662`	`2662`	`g.defer_stmts << defer_stmt`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@ fn (mut g Gen) write_defer_stmts(scope &ast.Scope, lookup bool, pos token.Pos) {`
`26`	`26`	`g.error('Gen.write_defer_stmts(): defer_stmt.scope is nil', pos)`
`27`	`27`	`}`
`28`	`28`
`29`		`- is_scoped := g.pref.scoped_defer && defer_stmt.mode == .scoped`
`30`		`- if is_scoped {`
	`29`	`+ if defer_stmt.mode == .scoped {`
`31`	`30`	`if !((lookup && defer_stmt.scope.start_pos < scope.start_pos`
`32`	`31`	`&& defer_stmt.scope.end_pos > scope.end_pos)`
`33`	`32`	`\|\| defer_stmt.scope == scope) {`
Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,7 @@ fn (mut g Gen) gen_fn_decl(node &ast.FnDecl, skip bool) {`
`454`	`454`	`}`
`455`	`455`	`g.indent++`
`456`	`456`	`for defer_stmt in node.defer_stmts {`
`457`		`- if defer_stmt.mode != .function && g.pref.scoped_defer {`
	`457`	`+ if defer_stmt.mode != .function {`
`458`	`458`	`continue`
`459`	`459`	`}`
`460`	`460`	`g.writeln('bool ${g.defer_flag_var(defer_stmt)} = false;')`
Original file line number	Diff line number	Diff line change
`@@ -260,8 +260,6 @@ pub mut:`
`260`	`260`	`subsystem Subsystem // the type of the window app, that is going to be generated; has no effect on !windows`
`261`	`261`	`is_vls bool`
`262`	`262`	`json_errors bool // -json-errors, for VLS and other tools`
`263`		`-`
`264`		- scoped_defer bool // experimental support, is activated with `-scoped-defer`
`265`	`263`	`}`
`266`	`264`
`267`	`265`	`pub fn parse_args(known_external_commands []string, args []string) (&Preferences, string) {`
`@@ -764,10 +762,6 @@ pub fn parse_args_and_show_errors(known_external_commands []string, args []strin`
`764`	`762`	`'-experimental' {`
`765`	`763`	`res.experimental = true`
`766`	`764`	`}`
`767`		`- '-scoped-defer' {`
`768`		`- // experimental, remove once defer is scoped by default`
`769`		`- res.scoped_defer = true`
`770`		`- }`
`771`	`765`	`'-usecache' {`
`772`	`766`	`res.use_cache = true`
`773`	`767`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// vtest vflags: -scoped-defer`
`2`		`-`
`3`	`1`	`fn foo() {`
`4`	`2`	`a := [u8(1), 2, 3]!`
`5`	`3`	`defer {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// vtest vflags: -scoped-defer`
`2`		`-`
`3`	`1`	`fn test_main() {`
`4`	`2`	`defer {`
`5`	`3`	`$if foo ? {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// vtest vflags: -scoped-defer`
`2`		`-`
`3`	`1`	`@[heap]`
`4`	`2`	`struct Hwe {`
`5`	`3`	`mut:`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// vtest vflags: -scoped-defer`
`2`		`-`
`3`	`1`	`@[unsafe]`
`4`	`2`	`fn g() {`
`5`	`3`	`mut static levels := 0`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// vtest vflags: -scoped-defer`
`2`		`-`
`3`	`1`	`fn foo() string {`
`4`	`2`	`println('foo()')`
`5`	`3`	`return 'foo'`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// vtest vflags: -scoped-defer`
`2`		`-`
`3`	`1`	`struct Test {`
`4`	`2`	`mut:`
`5`	`3`	`a int`