markused: cleanup logic + skip unused conditional fn (#24911)

felipensp · web-flow · commit cb8b8f22a285 · 2025-07-17T17:56:24.000+03:00
diff --git a/vlib/v/ast/table.v b/vlib/v/ast/table.v
@@ -15,7 +15,6 @@ pub mut:
 	range_index    bool            // string[0..1]
 	cast_ptr       bool            // &u8(...)
 	asserts        bool            // assert expr
-	as_cast        bool            // expr as Type
 	anon_fn        bool            // fn () { }
 	auto_str       bool            // auto str fns
 	auto_str_ptr   bool            // auto str fns for ptr type
@@ -30,9 +29,7 @@ pub mut:
 	arr_map        bool            // []map[key]value
 	type_name      bool            // var.type_name()
 	map_update     bool            // {...foo}
-	interpolation  bool            // '${foo} ${bar}'
 	print_options  bool            // print option type
-	waiter         bool            // has thread waiter
 	print_types    map[int]bool    // print() idx types
 	used_fns       map[string]bool // filled in by markused
 	used_consts    map[string]bool // filled in by markused
diff --git a/vlib/v/checker/checker.v b/vlib/v/checker/checker.v
@@ -2979,9 +2979,6 @@ pub fn (mut c Checker) expr(mut node ast.Expr) ast.Type {
 			node.expr_type = c.expr(mut node.expr)
 			expr_type_sym := c.table.sym(node.expr_type)
 			type_sym := c.table.sym(c.unwrap_generic(node.typ))
-			if !c.is_builtin_mod {
-				c.table.used_features.as_cast = true
-			}
 			if mut node.expr is ast.Ident {
 				if mut node.expr.obj is ast.Var {
 					ident_typ := if node.expr.obj.smartcasts.len > 0 {
diff --git a/vlib/v/checker/fn.v b/vlib/v/checker/fn.v
@@ -2720,9 +2720,6 @@ fn (mut c Checker) spawn_expr(mut node ast.SpawnExpr) ast.Type {
 		c.error('option handling cannot be done in `spawn` call. Do it when calling `.wait()`',
 			node.call_expr.or_block.pos)
 	}
-	if node.is_expr {
-		c.table.used_features.waiter = true
-	}
 	// Make sure there are no mutable arguments
 	for arg in node.call_expr.args {
 		if arg.is_mut && !arg.typ.is_ptr() {
@@ -2758,9 +2755,6 @@ fn (mut c Checker) go_expr(mut node ast.GoExpr) ast.Type {
 		c.error('option handling cannot be done in `go` call. Do it when calling `.wait()`',
 			node.call_expr.or_block.pos)
 	}
-	if node.is_expr {
-		c.table.used_features.waiter = true
-	}
 	// Make sure there are no mutable arguments
 	for arg in node.call_expr.args {
 		if arg.is_mut && !arg.typ.is_ptr() {
diff --git a/vlib/v/checker/infix.v b/vlib/v/checker/infix.v
@@ -60,7 +60,7 @@ fn (mut c Checker) infix_expr(mut node ast.InfixExpr) ast.Type {
 		if left_type.has_flag(.option) {
 			c.error('cannot push to Option array that was not unwrapped first', node.left.pos())
 		}
-		c.markused_infiexpr(!c.is_builtin_mod && c.mod != 'strings')
+		c.markused_infixexpr(!c.is_builtin_mod && c.mod != 'strings')
 		if mut node.right is ast.IfExpr {
 			if node.right.is_expr && node.right.branches.len > 0 {
 				mut last_stmt := node.right.branches[0].stmts.last()
diff --git a/vlib/v/checker/used_features.v b/vlib/v/checker/used_features.v
@@ -179,10 +179,9 @@ fn (mut c Checker) markused_string_inter_lit(mut node ast.StringInterLiteral, ft
 	if ftyp.has_option_or_result() {
 		c.table.used_features.print_options = true
 	}
-	c.table.used_features.interpolation = true
 }
 
-fn (mut c Checker) markused_infiexpr(check bool) {
+fn (mut c Checker) markused_infixexpr(check bool) {
 	if check {
 		c.table.used_features.index = true
 		c.table.used_features.arr_init = true
diff --git a/vlib/v/markused/markused.v b/vlib/v/markused/markused.v
@@ -32,6 +32,7 @@ pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&a
 
 	// Functions that must be generated and can't be skipped
 	mut all_fn_root_names := []string{}
+	mut include_panic_deps := false
 	if used_fns != '' {
 		aused_fns := used_fns.split(',')
 		all_fns_keys := all_fns.keys()
@@ -56,7 +57,6 @@ pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&a
 		// Note: this is temporary, until the native backend supports more features!
 		all_fn_root_names << 'main.main'
 	} else {
-		mut include_panic_deps := false
 		mut core_fns := [
 			'main.main',
 			'init_global_allocator', // needed for linux_bare and wasm_bare
@@ -156,9 +156,6 @@ pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&a
 		if table.used_features.arr_insert {
 			core_fns << ref_array_idx_str + '.insert_many'
 		}
-		if table.used_features.interpolation {
-			include_panic_deps = true
-		}
 		if table.used_features.dump {
 			include_panic_deps = true
 			builderptr_idx := int(table.find_type('strings.Builder').ref()).str()
@@ -168,9 +165,6 @@ pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&a
 				builderptr_idx + '.write_rune',
 			]
 		}
-		if table.used_features.waiter {
-			core_fns << 'free'
-		}
 		if !table.used_features.arr_init {
 			table.used_features.arr_init = table.used_features.print_types.keys().any(table.type_to_str(it).contains('[]'))
 		}
@@ -190,10 +184,6 @@ pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&a
 			core_fns << '_result_ok'
 			core_fns << charptr_idx_str + '.vstring_literal'
 		}
-		if table.used_features.as_cast {
-			core_fns << '__as_cast'
-			core_fns << 'new_array_from_c_array'
-		}
 		if table.used_features.anon_fn {
 			core_fns << 'memdup_uncollectable'
 		}
@@ -231,25 +221,12 @@ pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&a
 			core_fns << 'v.trace_calls.on_call'
 		}
 		if 'C.cJSON_Parse' in all_fns {
+			core_fns << '_result_ok'
 			core_fns << 'tos5'
 			core_fns << 'time.unix' // used by json
 			table.used_features.used_maps++ // json needs new_map etc
 			include_panic_deps = true
 		}
-		if include_panic_deps {
-			core_fns << [
-				'__new_array_with_default',
-				'__new_array_with_default_noscan',
-				'str_intp',
-				ref_array_idx_str + '.push',
-				ref_array_idx_str + '.push_noscan',
-				string_idx_str + '.substr',
-				array_idx_str + '.slice',
-				array_idx_str + '.get',
-				'v_fixed_index',
-				charptr_idx_str + '.vstring_literal',
-			]
-		}
 		if pref_.should_use_segfault_handler() {
 			core_fns << 'v_segmentation_fault_handler'
 		}
@@ -289,19 +266,27 @@ pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&a
 			all_fn_root_names << k
 			continue
 		}
-		mut method_receiver_typename := ''
 		if mfn.is_method {
-			method_receiver_typename = table.type_to_str(mfn.receiver.typ)
-		}
-		if method_receiver_typename == '&wyrand.WyRandRNG' {
-			// WyRandRNG is the default rand pseudo random generator
-			all_fn_root_names << k
-			continue
-		}
-		if table.used_features.auto_str && method_receiver_typename == '&strings.Builder' {
-			// implicit string builders are generated in auto_eq_methods.v
-			all_fn_root_names << k
-			continue
+			method_receiver_typename := table.type_to_str(mfn.receiver.typ)
+			if method_receiver_typename == '&wyrand.WyRandRNG' {
+				// WyRandRNG is the default rand pseudo random generator
+				all_fn_root_names << k
+				continue
+			}
+			if table.used_features.auto_str && method_receiver_typename == '&strings.Builder' {
+				// implicit string builders are generated in auto_eq_methods.v
+				all_fn_root_names << k
+				continue
+			}
+			if method_receiver_typename == '&sync.Channel' {
+				all_fn_root_names << k
+				continue
+			}
+			if mfn.name in ['+', '-', '*', '%', '/', '<', '=='] {
+				// TODO: mark the used operators in the checker
+				all_fn_root_names << k
+				continue
+			}
 		}
 		has_dot := k.contains('.')
 		// auto generated string interpolation functions, may
@@ -336,8 +321,8 @@ pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&a
 				all_fn_root_names << k
 				continue
 			}
-			if has_dot && (k.ends_with('.lock') || k.ends_with('.unlock')
-				|| k.ends_with('.rlock') || k.ends_with('.runlock')) {
+			if k.ends_with('.lock') || k.ends_with('.unlock') || k.ends_with('.rlock')
+				|| k.ends_with('.runlock') {
 				all_fn_root_names << k
 				continue
 			}
@@ -348,16 +333,6 @@ pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&a
 			all_fn_root_names << k
 			continue
 		}
-		if method_receiver_typename == '&sync.Channel' {
-			all_fn_root_names << k
-			continue
-		}
-		if mfn.receiver.typ != ast.void_type && mfn.generic_names.len > 0 {
-			// generic methods may be used in cgen after specialisation :-|
-			// TODO: move generic method specialisation from cgen to before markused
-			all_fn_root_names << k
-			continue
-		}
 		// testing framework:
 		if pref_.is_test {
 			if k.starts_with('test_')
@@ -370,8 +345,9 @@ pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&a
 				continue
 			}
 		}
-		if mfn.name in ['+', '-', '*', '%', '/', '<', '=='] {
-			// TODO: mark the used operators in the checker
+		if mfn.receiver.typ != ast.void_type && mfn.generic_names.len > 0 {
+			// generic methods may be used in cgen after specialisation :-|
+			// TODO: move generic method specialisation from cgen to before markused
 			all_fn_root_names << k
 			continue
 		}
@@ -530,6 +506,10 @@ pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&a
 		}
 	}
 
+	if include_panic_deps || walker.used_interp > 0 {
+		walker.mark_panic_deps()
+	}
+
 	if walker.used_panic > 0 {
 		walker.mark_fn_as_used('panic_option_not_set')
 		walker.mark_fn_as_used('panic_result_not_set')
diff --git a/vlib/v/markused/walker.v b/vlib/v/markused/walker.v
@@ -21,6 +21,7 @@ pub mut:
 	used_option  int // _option_ok
 	used_result  int // _result_ok
 	used_panic   int // option/result propagation
+	used_interp  int // str interpolation
 	n_asserts    int
 	pref         &pref.Preferences = unsafe { nil }
 mut:
@@ -375,6 +376,9 @@ fn (mut w Walker) expr(node_ ast.Expr) {
 			w.fn_by_name('eprintln')
 		}
 		ast.SpawnExpr {
+			if node.is_expr {
+				w.fn_by_name('free')
+			}
 			w.expr(node.call_expr)
 			w.fn_by_name('tos3')
 			if w.pref.os == .windows {
@@ -386,6 +390,9 @@ fn (mut w Walker) expr(node_ ast.Expr) {
 			}
 		}
 		ast.GoExpr {
+			if node.is_expr {
+				w.fn_by_name('free')
+			}
 			w.expr(node.call_expr)
 		}
 		ast.IndexExpr {
@@ -520,6 +527,7 @@ fn (mut w Walker) expr(node_ ast.Expr) {
 			w.expr(node.expr)
 		}
 		ast.StringInterLiteral {
+			w.used_interp++
 			w.exprs(node.exprs)
 		}
 		ast.SelectorExpr {
@@ -564,6 +572,8 @@ fn (mut w Walker) expr(node_ ast.Expr) {
 		///
 		ast.AsCast {
 			w.expr(node.expr)
+			w.fn_by_name('__as_cast')
+			w.fn_by_name('new_array_from_c_array')
 		}
 		ast.AtExpr {}
 		ast.BoolLiteral {}
@@ -767,7 +777,7 @@ pub fn (mut w Walker) call_expr(mut node ast.CallExpr) {
 		w.mark_fn_as_used(fn_name)
 	}
 	stmt := w.all_fns[fn_name] or { return }
-	if stmt.name == node.name {
+	if !stmt.should_be_skipped && stmt.name == node.name {
 		if !node.is_method || receiver_typ == stmt.receiver.typ {
 			w.stmts(stmt.stmts)
 		}
@@ -815,6 +825,24 @@ pub fn (mut w Walker) or_block(node ast.OrExpr) {
 	}
 }
 
+pub fn (mut w Walker) mark_panic_deps() {
+	ref_array_idx_str := int(ast.array_type.ref()).str()
+	string_idx_str := ast.string_type_idx.str()
+	array_idx_str := ast.array_type_idx.str()
+	charptr_idx_str := ast.charptr_type_idx.str()
+
+	w.fn_by_name('__new_array_with_default')
+	w.fn_by_name('__new_array_with_default_noscan')
+	w.fn_by_name('str_intp')
+	w.fn_by_name(ref_array_idx_str + '.push')
+	w.fn_by_name(ref_array_idx_str + '.push_noscan')
+	w.fn_by_name(string_idx_str + '.substr')
+	w.fn_by_name(array_idx_str + '.slice')
+	w.fn_by_name(array_idx_str + '.get')
+	w.fn_by_name('v_fixed_index')
+	w.fn_by_name(charptr_idx_str + '.vstring_literal')
+}
+
 pub fn (mut w Walker) mark_interface_by_symbol(isym ast.TypeSymbol) {
 	if isym.name in w.used_ifaces {
 		return

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ fn (mut c Checker) infix_expr(mut node ast.InfixExpr) ast.Type {`
`60`	`60`	`if left_type.has_flag(.option) {`
`61`	`61`	`c.error('cannot push to Option array that was not unwrapped first', node.left.pos())`
`62`	`62`	`}`
`63`		`- c.markused_infiexpr(!c.is_builtin_mod && c.mod != 'strings')`
	`63`	`+ c.markused_infixexpr(!c.is_builtin_mod && c.mod != 'strings')`
`64`	`64`	`if mut node.right is ast.IfExpr {`
`65`	`65`	`if node.right.is_expr && node.right.branches.len > 0 {`
`66`	`66`	`mut last_stmt := node.right.branches[0].stmts.last()`
Original file line number	Diff line number	Diff line change
`@@ -179,10 +179,9 @@ fn (mut c Checker) markused_string_inter_lit(mut node ast.StringInterLiteral, ft`
`179`	`179`	`if ftyp.has_option_or_result() {`
`180`	`180`	`c.table.used_features.print_options = true`
`181`	`181`	`}`
`182`		`- c.table.used_features.interpolation = true`
`183`	`182`	`}`
`184`	`183`
`185`		`-fn (mut c Checker) markused_infiexpr(check bool) {`
	`184`	`+fn (mut c Checker) markused_infixexpr(check bool) {`
`186`	`185`	`if check {`
`187`	`186`	`c.table.used_features.index = true`
`188`	`187`	`c.table.used_features.arr_init = true`