cgen,markused: remove unused enum declarations too (#25033)

felipensp · web-flow · commit b74e60b5a23b · 2025-08-04T08:44:21.000+03:00
diff --git a/cmd/tools/vast/vast.v b/cmd/tools/vast/vast.v
@@ -729,6 +729,7 @@ fn (t Tree) enum_decl(node ast.EnumDecl) &Node {
 	obj.add('comments', t.array_node_comment(node.comments))
 	obj.add_terse('attrs', t.array_node_attr(node.attrs))
 	obj.add_terse('typ', t.type_node(node.typ))
+	obj.add_terse('enum_typ', t.type_node(node.enum_typ))
 	return obj
 }
 
diff --git a/vlib/v/ast/ast.v b/vlib/v/ast/ast.v
@@ -1475,6 +1475,8 @@ pub:
 	typ              Type        // the default is `int`; can be changed by `enum Big as u64 { a = 5 }`
 	typ_pos          token.Pos
 	pos              token.Pos
+pub mut:
+	enum_typ Type
 }
 
 pub struct AliasTypeDecl {
diff --git a/vlib/v/checker/checker.v b/vlib/v/checker/checker.v
@@ -2161,6 +2161,7 @@ fn (mut c Checker) enum_decl(mut node ast.EnumDecl) {
 			}
 		}
 	}
+	node.enum_typ = c.table.find_type_idx(node.name)
 }
 
 fn (mut c Checker) check_enum_field_integer_literal(expr ast.IntegerLiteral, is_signed bool, is_multi_allowed bool,
diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v
@@ -4771,7 +4771,7 @@ fn (mut g Gen) enum_decl(node ast.EnumDecl) {
 		}
 		return
 	}
-	if g.pref.skip_unused && node.typ.idx() !in g.table.used_features.used_syms {
+	if g.pref.skip_unused && node.enum_typ !in g.table.used_features.used_syms {
 		return
 	}
 	g.enum_typedefs.writeln('')
diff --git a/vlib/v/markused/walker.v b/vlib/v/markused/walker.v
@@ -846,7 +846,7 @@ fn (mut w Walker) expr(node_ ast.Expr) {
 					w.expr(filtered[0].expr)
 				}
 			}
-			w.mark_by_sym_name(node.enum_name)
+			w.mark_by_type(node.typ)
 		}
 		ast.LockExpr {
 			w.uses_lock = true

Original file line number	Diff line number	Diff line change
`@@ -729,6 +729,7 @@ fn (t Tree) enum_decl(node ast.EnumDecl) &Node {`
`729`	`729`	`obj.add('comments', t.array_node_comment(node.comments))`
`730`	`730`	`obj.add_terse('attrs', t.array_node_attr(node.attrs))`
`731`	`731`	`obj.add_terse('typ', t.type_node(node.typ))`
	`732`	`+ obj.add_terse('enum_typ', t.type_node(node.enum_typ))`
`732`	`733`	`return obj`
`733`	`734`	`}`
`734`	`735`
Original file line number	Diff line number	Diff line change
`@@ -1475,6 +1475,8 @@ pub:`
`1475`	`1475`	typ Type // the default is `int`; can be changed by `enum Big as u64 { a = 5 }`
`1476`	`1476`	`typ_pos token.Pos`
`1477`	`1477`	`pos token.Pos`
	`1478`	`+pub mut:`
	`1479`	`+ enum_typ Type`
`1478`	`1480`	`}`
`1479`	`1481`
`1480`	`1482`	`pub struct AliasTypeDecl {`
Original file line number	Diff line number	Diff line change
`@@ -2161,6 +2161,7 @@ fn (mut c Checker) enum_decl(mut node ast.EnumDecl) {`
`2161`	`2161`	`}`
`2162`	`2162`	`}`
`2163`	`2163`	`}`
	`2164`	`+ node.enum_typ = c.table.find_type_idx(node.name)`
`2164`	`2165`	`}`
`2165`	`2166`
`2166`	`2167`	`fn (mut c Checker) check_enum_field_integer_literal(expr ast.IntegerLiteral, is_signed bool, is_multi_allowed bool,`
Original file line number	Diff line number	Diff line change
`@@ -4771,7 +4771,7 @@ fn (mut g Gen) enum_decl(node ast.EnumDecl) {`
`4771`	`4771`	`}`
`4772`	`4772`	`return`
`4773`	`4773`	`}`
`4774`		`- if g.pref.skip_unused && node.typ.idx() !in g.table.used_features.used_syms {`
	`4774`	`+ if g.pref.skip_unused && node.enum_typ !in g.table.used_features.used_syms {`
`4775`	`4775`	`return`
`4776`	`4776`	`}`
`4777`	`4777`	`g.enum_typedefs.writeln('')`
Original file line number	Diff line number	Diff line change
`@@ -846,7 +846,7 @@ fn (mut w Walker) expr(node_ ast.Expr) {`
`846`	`846`	`w.expr(filtered[0].expr)`
`847`	`847`	`}`
`848`	`848`	`}`
`849`		`- w.mark_by_sym_name(node.enum_name)`
	`849`	`+ w.mark_by_type(node.typ)`
`850`	`850`	`}`
`851`	`851`	`ast.LockExpr {`
`852`	`852`	`w.uses_lock = true`