markused: reduce unused code by removing unused safe_int fns (#25402)

felipensp · web-flow · commit 16683edb90e9 · 2025-09-29T06:07:25.000+03:00
diff --git a/vlib/v/ast/table.v b/vlib/v/ast/table.v
@@ -26,6 +26,7 @@ pub mut:
 	arr_map        bool            // []map[key]value
 	type_name      bool            // var.type_name()
 	print_options  bool            // print option type
+	safe_int       bool            // needs safe int comparison
 	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/gen/c/cgen.v b/vlib/v/gen/c/cgen.v
@@ -1003,6 +1003,9 @@ pub fn (mut g Gen) init() {
 		} else {
 			g.cheaders.writeln(c_headers)
 		}
+		if !g.pref.skip_unused || g.table.used_features.safe_int {
+			g.cheaders.writeln(c_unsigned_comparison_functions)
+		}
 		if !g.pref.skip_unused || g.table.used_features.used_attr_weak {
 			g.cheaders.writeln(c_common_weak_attr)
 		}
diff --git a/vlib/v/gen/c/cheaders.v b/vlib/v/gen/c/cheaders.v
@@ -309,7 +309,7 @@ const c_helper_macros = '//============================== HELPER C MACROS ======
 #define _PUSH_MANY_noscan(arr, val, tmp, tmp_typ) {tmp_typ tmp = (val); builtin__array_push_many_noscan(arr, tmp.data, tmp.len);}
 '
 
-const c_headers = c_helper_macros + c_unsigned_comparison_functions + c_common_macros +
+const c_headers = c_helper_macros + c_common_macros +
 	r'
 // c_headers
 typedef int (*qsort_callback_func)(const void*, const void*);
@@ -491,7 +491,7 @@ typedef void (*MapCloneFn)(voidptr, voidptr);
 typedef void (*MapFreeFn)(voidptr);
 '
 
-const c_bare_headers = c_helper_macros + c_unsigned_comparison_functions + c_common_macros +
+const c_bare_headers = c_helper_macros + c_common_macros +
 	'
 #define _VFREESTANDING
 typedef long unsigned int size_t;
diff --git a/vlib/v/markused/walker.v b/vlib/v/markused/walker.v
@@ -666,8 +666,15 @@ fn (mut w Walker) expr(node_ ast.Expr) {
 					w.mark_by_sym(right_sym)
 				}
 			}
-			if !w.uses_eq && node.op in [.eq, .ne] {
-				w.uses_eq = true
+			if node.op in [.eq, .ne, .gt, .ge, .lt, .le] {
+				if !w.table.used_features.safe_int && node.left_type != 0 && node.right_type != 0 {
+					left := w.table.unaliased_type(node.left_type)
+					right := w.table.unaliased_type(node.right_type)
+					w.table.used_features.safe_int = (
+						(left.idx() in [ast.u32_type_idx, ast.u64_type_idx] && right.is_signed())
+						|| (right.idx() in [ast.u32_type_idx, ast.u64_type_idx] && left.is_signed()))
+				}
+				w.uses_eq = w.uses_eq || node.op in [.eq, .ne]
 			}
 		}
 		ast.IfGuardExpr {

Original file line number	Diff line number	Diff line change
`@@ -1003,6 +1003,9 @@ pub fn (mut g Gen) init() {`
`1003`	`1003`	`} else {`
`1004`	`1004`	`g.cheaders.writeln(c_headers)`
`1005`	`1005`	`}`
	`1006`	`+ if !g.pref.skip_unused \|\| g.table.used_features.safe_int {`
	`1007`	`+ g.cheaders.writeln(c_unsigned_comparison_functions)`
	`1008`	`+ }`
`1006`	`1009`	`if !g.pref.skip_unused \|\| g.table.used_features.used_attr_weak {`
`1007`	`1010`	`g.cheaders.writeln(c_common_weak_attr)`
`1008`	`1011`	`}`
Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ const c_helper_macros = '//============================== HELPER C MACROS ======`
`309`	`309`	`#define _PUSH_MANY_noscan(arr, val, tmp, tmp_typ) {tmp_typ tmp = (val); builtin__array_push_many_noscan(arr, tmp.data, tmp.len);}`
`310`	`310`	`'`
`311`	`311`
`312`		`-const c_headers = c_helper_macros + c_unsigned_comparison_functions + c_common_macros +`
	`312`	`+const c_headers = c_helper_macros + c_common_macros +`
`313`	`313`	`r'`
`314`	`314`	`// c_headers`
`315`	`315`	`typedef int (qsort_callback_func)(const void, const void*);`
`@@ -491,7 +491,7 @@ typedef void (*MapCloneFn)(voidptr, voidptr);`
`491`	`491`	`typedef void (*MapFreeFn)(voidptr);`
`492`	`492`	`'`
`493`	`493`
`494`		`-const c_bare_headers = c_helper_macros + c_unsigned_comparison_functions + c_common_macros +`
	`494`	`+const c_bare_headers = c_helper_macros + c_common_macros +`
`495`	`495`	`'`
`496`	`496`	`#define _VFREESTANDING`
`497`	`497`	`typedef long unsigned int size_t;`
Original file line number	Diff line number	Diff line change
`@@ -666,8 +666,15 @@ fn (mut w Walker) expr(node_ ast.Expr) {`
`666`	`666`	`w.mark_by_sym(right_sym)`
`667`	`667`	`}`
`668`	`668`	`}`
`669`		`- if !w.uses_eq && node.op in [.eq, .ne] {`
`670`		`- w.uses_eq = true`
	`669`	`+ if node.op in [.eq, .ne, .gt, .ge, .lt, .le] {`
	`670`	`+ if !w.table.used_features.safe_int && node.left_type != 0 && node.right_type != 0 {`
	`671`	`+ left := w.table.unaliased_type(node.left_type)`
	`672`	`+ right := w.table.unaliased_type(node.right_type)`
	`673`	`+ w.table.used_features.safe_int = (`
	`674`	`+ (left.idx() in [ast.u32_type_idx, ast.u64_type_idx] && right.is_signed())`
	`675`	`+ \|\| (right.idx() in [ast.u32_type_idx, ast.u64_type_idx] && left.is_signed()))`
	`676`	`+ }`
	`677`	`+ w.uses_eq = w.uses_eq \|\| node.op in [.eq, .ne]`
`671`	`678`	`}`
`672`	`679`	`}`
`673`	`680`	`ast.IfGuardExpr {`