markused: fix interface fields and chan usage (fix #24961) (#24962)

felipensp · web-flow · commit a309593f568c · 2025-07-24T18:25:41.000+03:00
diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v
@@ -1185,6 +1185,9 @@ pub fn (mut g Gen) write_typeof_functions() {
 			if inter_info.is_generic {
 				continue
 			}
+			if g.pref.skip_unused && sym.idx !in g.table.used_features.used_syms {
+				continue
+			}
 			g.definitions.writeln('${g.static_non_parallel}char * v_typeof_interface_${sym.cname}(int sidx);')
 			if g.pref.parallel_cc {
 				g.extern_out.writeln('extern char * v_typeof_interface_${sym.cname}(int sidx);')
@@ -1620,6 +1623,13 @@ fn (mut g Gen) write_chan_pop_option_fns() {
 		if opt_el_type in done {
 			continue
 		}
+		if g.pref.skip_unused {
+			if sym := g.table.find_sym(opt_el_type) {
+				if sym.idx !in g.table.used_features.used_syms {
+					continue
+				}
+			}
+		}
 		done << opt_el_type
 		g.channel_definitions.writeln('
 static inline ${opt_el_type} __Option_${styp}_popval(${styp} ch) {
@@ -1642,6 +1652,13 @@ fn (mut g Gen) write_chan_push_option_fns() {
 		if styp in done {
 			continue
 		}
+		if g.pref.skip_unused {
+			if sym := g.table.find_sym(el_type) {
+				if sym.idx !in g.table.used_features.used_syms {
+					continue
+				}
+			}
+		}
 		done << styp
 		g.register_option(ast.void_type.set_flag(.option))
 		g.channel_definitions.writeln('
@@ -1744,10 +1761,14 @@ pub fn (mut g Gen) write_typedef_types() {
 			}
 			.chan {
 				if sym.name != 'chan' {
-					g.type_definitions.writeln('typedef chan ${sym.cname};')
 					chan_inf := sym.chan_info()
 					chan_elem_type := chan_inf.elem_type
-					is_fixed_arr := g.table.sym(chan_elem_type).kind == .array_fixed
+					esym := g.table.sym(chan_elem_type)
+					if g.pref.skip_unused && esym.idx !in g.table.used_features.used_syms {
+						continue
+					}
+					g.type_definitions.writeln('typedef chan ${sym.cname};')
+					is_fixed_arr := esym.kind == .array_fixed
 					if !chan_elem_type.has_flag(.generic) {
 						el_stype := if is_fixed_arr { '_v_' } else { '' } + g.styp(chan_elem_type)
 						val_arg_pop := if is_fixed_arr { '&val.ret_arr' } else { '&val' }
@@ -1798,6 +1819,9 @@ static inline void __${sym.cname}_pushval(${sym.cname} ch, ${push_arg} val) {
 		}
 	}
 	for sym in interface_non_generic_syms {
+		if g.pref.skip_unused && sym.idx !in g.table.used_features.used_syms {
+			continue
+		}
 		g.write_interface_typesymbol_declaration(sym)
 	}
 }
@@ -6444,7 +6468,8 @@ fn (mut g Gen) write_debug_calls_typeof_functions() {
 				continue
 			}
 			inter_info := sym.info as ast.Interface
-			if inter_info.is_generic {
+			if inter_info.is_generic
+				|| (g.pref.skip_unused && sym.idx !in g.table.used_features.used_syms) {
 				continue
 			}
 			g.writeln('\tv_typeof_interface_${sym.cname}(0);')
@@ -6646,6 +6671,9 @@ fn (mut g Gen) write_builtin_types() {
 	// everything except builtin will get sorted
 	for builtin_name in ast.builtins {
 		sym := g.table.sym_by_idx(g.table.type_idxs[builtin_name])
+		if g.pref.skip_unused && sym.idx !in g.table.used_features.used_syms {
+			continue
+		}
 		if sym.info is ast.Interface {
 			g.write_interface_typedef(sym)
 			if !sym.info.is_generic {
@@ -7802,6 +7830,9 @@ fn (mut g Gen) interface_table() string {
 		if inter_info.is_generic {
 			continue
 		}
+		if g.pref.skip_unused && isym.idx !in g.table.used_features.used_syms {
+			continue
+		}
 		// interface_name is for example Speaker
 		interface_name := isym.cname
 		// generate a struct that references interface methods
diff --git a/vlib/v/markused/markused.v b/vlib/v/markused/markused.v
@@ -8,7 +8,7 @@ import v.pref
 
 // mark_used walks the AST, starting at main() and marks all used fns transitively.
 pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&ast.File) {
-	mut all_fns, all_consts, all_globals, all_fields, all_decltypes := all_global_decl(ast_files)
+	mut all_fns, all_consts, all_globals, all_fields, all_decltypes, all_structs := all_global_decl(ast_files)
 	util.timing_start('MARKUSED')
 	defer {
 		util.timing_measure('MARKUSED')
@@ -447,6 +447,7 @@ pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&a
 		all_globals:   all_globals
 		all_fields:    all_fields
 		all_decltypes: all_decltypes
+		all_structs:   all_structs
 		pref:          pref_
 	)
 	walker.mark_markused_consts() // tagged with `@[markused]`
@@ -586,7 +587,7 @@ pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&a
 	}
 }
 
-fn all_global_decl(ast_files []&ast.File) (map[string]ast.FnDecl, map[string]ast.ConstField, map[string]ast.GlobalField, map[string]ast.StructField, map[string]ast.Type) {
+fn all_global_decl(ast_files []&ast.File) (map[string]ast.FnDecl, map[string]ast.ConstField, map[string]ast.GlobalField, map[string]ast.StructField, map[string]ast.Type, map[string]ast.StructDecl) {
 	util.timing_start(@METHOD)
 	defer {
 		util.timing_measure(@METHOD)
@@ -596,6 +597,7 @@ fn all_global_decl(ast_files []&ast.File) (map[string]ast.FnDecl, map[string]ast
 	mut all_globals := map[string]ast.GlobalField{}
 	mut all_fields := map[string]ast.StructField{}
 	mut all_decltypes := map[string]ast.Type{}
+	mut all_structs := map[string]ast.StructDecl{}
 	for i in 0 .. ast_files.len {
 		for node in ast_files[i].stmts {
 			match node {
@@ -622,6 +624,7 @@ fn all_global_decl(ast_files []&ast.File) (map[string]ast.FnDecl, map[string]ast
 						sfkey := sfield.sfkey()
 						all_fields[sfkey] = sfield
 					}
+					all_structs[node.name] = node
 				}
 				ast.TypeDecl {
 					all_decltypes[node.name] = node.typ
@@ -630,7 +633,7 @@ fn all_global_decl(ast_files []&ast.File) (map[string]ast.FnDecl, map[string]ast
 			}
 		}
 	}
-	return all_fns, all_consts, all_globals, all_fields, all_decltypes
+	return all_fns, all_consts, all_globals, all_fields, all_decltypes, all_structs
 }
 
 fn mark_all_methods_used(mut table ast.Table, mut all_fn_root_names []string, typ ast.Type) {
diff --git a/vlib/v/markused/walker.v b/vlib/v/markused/walker.v
@@ -30,6 +30,7 @@ mut:
 	all_globals   map[string]ast.GlobalField
 	all_fields    map[string]ast.StructField
 	all_decltypes map[string]ast.Type
+	all_structs   map[string]ast.StructDecl
 }
 
 pub fn Walker.new(params Walker) &Walker {
@@ -301,6 +302,9 @@ pub fn (mut w Walker) stmt(node_ ast.Stmt) {
 			}
 		}
 		ast.StructDecl {
+			for typ in node.implements_types {
+				w.mark_by_type(typ.typ)
+			}
 			w.struct_fields(node.fields)
 		}
 		ast.DeferStmt {
@@ -921,8 +925,7 @@ pub fn (mut w Walker) mark_by_type(typ ast.Type) {
 	if typ.has_flag(.generic) {
 		return
 	}
-	sym := w.table.sym(typ)
-	w.mark_by_sym(sym)
+	w.mark_by_sym(w.table.sym(typ))
 }
 
 pub fn (mut w Walker) mark_by_sym(isym ast.TypeSymbol) {
@@ -945,24 +948,28 @@ pub fn (mut w Walker) mark_by_sym(isym ast.TypeSymbol) {
 						}
 					}
 					match fsym.info {
-						ast.Struct, ast.SumType, ast.FnType, ast.Alias, ast.Chan {
-							w.mark_by_sym(fsym)
-						}
 						ast.Array, ast.ArrayFixed {
 							w.features.used_arrays++
-							w.mark_by_type(ifield.typ)
+							w.mark_by_sym(fsym)
 						}
 						ast.Map {
 							w.features.used_maps++
-							w.mark_by_type(ifield.typ)
+							w.mark_by_sym(fsym)
+						}
+						else {
+							w.mark_by_sym(fsym)
 						}
-						else {}
 					}
 				}
 			}
 			for embed in isym.info.embeds {
 				w.mark_by_type(embed)
 			}
+			if decl := w.all_structs[isym.name] {
+				for iface_typ in decl.implements_types {
+					w.mark_by_type(iface_typ.typ)
+				}
+			}
 		}
 		ast.ArrayFixed, ast.Array {
 			w.mark_by_type(isym.info.elem_type)
@@ -1024,6 +1031,9 @@ pub fn (mut w Walker) mark_by_sym(isym ast.TypeSymbol) {
 			if isym.info.parent_type != 0 {
 				w.mark_by_type(isym.info.parent_type)
 			}
+			for field in isym.info.fields {
+				w.mark_by_type(field.typ)
+			}
 			for method in isym.methods {
 				if method.receiver_type != 0 {
 					w.mark_by_type(method.receiver_type)
diff --git a/vlib/v/tests/skip_unused/interface_unused.run.out b/vlib/v/tests/skip_unused/interface_unused.run.out
diff --git a/vlib/v/tests/skip_unused/interface_unused.skip_unused.run.out b/vlib/v/tests/skip_unused/interface_unused.skip_unused.run.out
diff --git a/vlib/v/tests/skip_unused/interface_unused.vv b/vlib/v/tests/skip_unused/interface_unused.vv
@@ -0,0 +1,5 @@
+struct Foo {}
+
+interface Bar {
+	a Foo
+}

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import v.pref`
`8`	`8`
`9`	`9`	`// mark_used walks the AST, starting at main() and marks all used fns transitively.`
`10`	`10`	`pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&ast.File) {`
`11`		`- mut all_fns, all_consts, all_globals, all_fields, all_decltypes := all_global_decl(ast_files)`
	`11`	`+ mut all_fns, all_consts, all_globals, all_fields, all_decltypes, all_structs := all_global_decl(ast_files)`
`12`	`12`	`util.timing_start('MARKUSED')`
`13`	`13`	`defer {`
`14`	`14`	`util.timing_measure('MARKUSED')`
`@@ -447,6 +447,7 @@ pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&a`
`447`	`447`	`all_globals: all_globals`
`448`	`448`	`all_fields: all_fields`
`449`	`449`	`all_decltypes: all_decltypes`
	`450`	`+ all_structs: all_structs`
`450`	`451`	`pref: pref_`
`451`	`452`	`)`
`452`	`453`	walker.mark_markused_consts() // tagged with `@[markused]`
`@@ -586,7 +587,7 @@ pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&a`
`586`	`587`	`}`
`587`	`588`	`}`
`588`	`589`
`589`		`-fn all_global_decl(ast_files []&ast.File) (map[string]ast.FnDecl, map[string]ast.ConstField, map[string]ast.GlobalField, map[string]ast.StructField, map[string]ast.Type) {`
	`590`	`+fn all_global_decl(ast_files []&ast.File) (map[string]ast.FnDecl, map[string]ast.ConstField, map[string]ast.GlobalField, map[string]ast.StructField, map[string]ast.Type, map[string]ast.StructDecl) {`
`590`	`591`	`util.timing_start(@METHOD)`
`591`	`592`	`defer {`
`592`	`593`	`util.timing_measure(@METHOD)`
`@@ -596,6 +597,7 @@ fn all_global_decl(ast_files []&ast.File) (map[string]ast.FnDecl, map[string]ast`
`596`	`597`	`mut all_globals := map[string]ast.GlobalField{}`
`597`	`598`	`mut all_fields := map[string]ast.StructField{}`
`598`	`599`	`mut all_decltypes := map[string]ast.Type{}`
	`600`	`+ mut all_structs := map[string]ast.StructDecl{}`
`599`	`601`	`for i in 0 .. ast_files.len {`
`600`	`602`	`for node in ast_files[i].stmts {`
`601`	`603`	`match node {`
`@@ -622,6 +624,7 @@ fn all_global_decl(ast_files []&ast.File) (map[string]ast.FnDecl, map[string]ast`
`622`	`624`	`sfkey := sfield.sfkey()`
`623`	`625`	`all_fields[sfkey] = sfield`
`624`	`626`	`}`
	`627`	`+ all_structs[node.name] = node`
`625`	`628`	`}`
`626`	`629`	`ast.TypeDecl {`
`627`	`630`	`all_decltypes[node.name] = node.typ`
`@@ -630,7 +633,7 @@ fn all_global_decl(ast_files []&ast.File) (map[string]ast.FnDecl, map[string]ast`
`630`	`633`	`}`
`631`	`634`	`}`
`632`	`635`	`}`
`633`		`- return all_fns, all_consts, all_globals, all_fields, all_decltypes`
	`636`	`+ return all_fns, all_consts, all_globals, all_fields, all_decltypes, all_structs`
`634`	`637`	`}`
`635`	`638`
`636`	`639`	`fn mark_all_methods_used(mut table ast.Table, mut all_fn_root_names []string, typ ast.Type) {`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ mut:`
`30`	`30`	`all_globals map[string]ast.GlobalField`
`31`	`31`	`all_fields map[string]ast.StructField`
`32`	`32`	`all_decltypes map[string]ast.Type`
	`33`	`+ all_structs map[string]ast.StructDecl`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`pub fn Walker.new(params Walker) &Walker {`
`@@ -301,6 +302,9 @@ pub fn (mut w Walker) stmt(node_ ast.Stmt) {`
`301`	`302`	`}`
`302`	`303`	`}`
`303`	`304`	`ast.StructDecl {`
	`305`	`+ for typ in node.implements_types {`
	`306`	`+ w.mark_by_type(typ.typ)`
	`307`	`+ }`
`304`	`308`	`w.struct_fields(node.fields)`
`305`	`309`	`}`
`306`	`310`	`ast.DeferStmt {`
`@@ -921,8 +925,7 @@ pub fn (mut w Walker) mark_by_type(typ ast.Type) {`
`921`	`925`	`if typ.has_flag(.generic) {`
`922`	`926`	`return`
`923`	`927`	`}`
`924`		`- sym := w.table.sym(typ)`
`925`		`- w.mark_by_sym(sym)`
	`928`	`+ w.mark_by_sym(w.table.sym(typ))`
`926`	`929`	`}`
`927`	`930`
`928`	`931`	`pub fn (mut w Walker) mark_by_sym(isym ast.TypeSymbol) {`
`@@ -945,24 +948,28 @@ pub fn (mut w Walker) mark_by_sym(isym ast.TypeSymbol) {`
`945`	`948`	`}`
`946`	`949`	`}`
`947`	`950`	`match fsym.info {`
`948`		`- ast.Struct, ast.SumType, ast.FnType, ast.Alias, ast.Chan {`
`949`		`- w.mark_by_sym(fsym)`
`950`		`- }`
`951`	`951`	`ast.Array, ast.ArrayFixed {`
`952`	`952`	`w.features.used_arrays++`
`953`		`- w.mark_by_type(ifield.typ)`
	`953`	`+ w.mark_by_sym(fsym)`
`954`	`954`	`}`
`955`	`955`	`ast.Map {`
`956`	`956`	`w.features.used_maps++`
`957`		`- w.mark_by_type(ifield.typ)`
	`957`	`+ w.mark_by_sym(fsym)`
	`958`	`+ }`
	`959`	`+ else {`
	`960`	`+ w.mark_by_sym(fsym)`
`958`	`961`	`}`
`959`		`- else {}`
`960`	`962`	`}`
`961`	`963`	`}`
`962`	`964`	`}`
`963`	`965`	`for embed in isym.info.embeds {`
`964`	`966`	`w.mark_by_type(embed)`
`965`	`967`	`}`
	`968`	`+ if decl := w.all_structs[isym.name] {`
	`969`	`+ for iface_typ in decl.implements_types {`
	`970`	`+ w.mark_by_type(iface_typ.typ)`
	`971`	`+ }`
	`972`	`+ }`
`966`	`973`	`}`
`967`	`974`	`ast.ArrayFixed, ast.Array {`
`968`	`975`	`w.mark_by_type(isym.info.elem_type)`
`@@ -1024,6 +1031,9 @@ pub fn (mut w Walker) mark_by_sym(isym ast.TypeSymbol) {`
`1024`	`1031`	`if isym.info.parent_type != 0 {`
`1025`	`1032`	`w.mark_by_type(isym.info.parent_type)`
`1026`	`1033`	`}`
	`1034`	`+ for field in isym.info.fields {`
	`1035`	`+ w.mark_by_type(field.typ)`
	`1036`	`+ }`
`1027`	`1037`	`for method in isym.methods {`
`1028`	`1038`	`if method.receiver_type != 0 {`
`1029`	`1039`	`w.mark_by_type(method.receiver_type)`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +struct Foo {}
++
 +interface Bar {
 +	a Foo
 +}