markused: fix eprintln(err) on imported module on short program (related: #23498) (#23499)

felipensp · web-flow · commit c98295b29425 · 2025-01-17T20:10:59.000+02:00
diff --git a/vlib/v/ast/table.v b/vlib/v/ast/table.v
@@ -39,7 +39,7 @@ pub mut:
 	used_veb_types   []Type          // veb context types, filled in by checker
 	used_maps        int             // how many times maps were used, filled in by markused
 	used_arrays      int             // how many times arrays were used, filled in by markused
-	used_modules     map[string]bool // filled in checker
+	external_types   bool            // true, when external type is used
 	// json             bool            // json is imported
 	debugger       bool            // debugger is used
 	comptime_calls map[string]bool // resolved name to call on comptime
diff --git a/vlib/v/checker/checker.v b/vlib/v/checker/checker.v
@@ -4004,7 +4004,7 @@ fn (mut c Checker) ident(mut node ast.Ident) ast.Type {
 				node.pos)
 		}
 		if c.pref.skip_unused && !c.is_builtin_mod && node.language == .v && node.name.contains('.') {
-			c.table.used_features.used_modules[node.name.all_before('.')] = true
+			c.table.used_features.external_types = true
 		}
 		if mut obj := node.scope.find(node.name) {
 			match mut obj {
diff --git a/vlib/v/checker/fn.v b/vlib/v/checker/fn.v
@@ -761,15 +761,14 @@ fn (mut c Checker) call_expr(mut node ast.CallExpr) ast.Type {
 		}
 	}
 	c.expected_or_type = old_expected_or_type
-	if c.pref.skip_unused && !c.is_builtin_mod && c.mod == 'main' {
+	if c.pref.skip_unused && !c.is_builtin_mod && c.mod == 'main'
+		&& !c.table.used_features.external_types {
 		if node.is_method {
-			type_str := c.table.type_to_str(node.left_type)
-			if c.table.sym(node.left_type).is_builtin()
-				&& type_str !in c.table.used_features.used_modules {
-				c.table.used_features.used_modules[type_str] = true
+			if c.table.sym(node.left_type).is_builtin() {
+				c.table.used_features.external_types = true
 			}
 		} else if node.name.contains('.') {
-			c.table.used_features.used_modules[node.name.all_before('.')] = true
+			c.table.used_features.external_types = true
 		}
 	}
 
diff --git a/vlib/v/checker/struct.v b/vlib/v/checker/struct.v
@@ -443,6 +443,10 @@ fn (mut c Checker) struct_init(mut node ast.StructInit, is_field_zero_struct_ini
 			node.typ = c.expected_type
 		}
 	}
+	if c.pref.skip_unused && !c.is_builtin_mod && !c.table.used_features.external_types {
+		type_str := c.table.type_to_str(node.typ)
+		c.table.used_features.external_types = type_str.contains('.') && type_str.len > 1
+	}
 	struct_sym := c.table.sym(node.typ)
 	mut old_inside_generic_struct_init := false
 	mut old_cur_struct_generic_types := []ast.Type{}
diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v
@@ -6169,7 +6169,7 @@ fn (mut g Gen) write_init_function() {
 		g.write('\tas_cast_type_indexes = ')
 		g.writeln(g.as_cast_name_table())
 	}
-	if !g.pref.is_shared && (!g.pref.skip_unused || g.table.used_features.used_modules.len > 0) {
+	if !g.pref.is_shared && (!g.pref.skip_unused || g.table.used_features.external_types) {
 		// shared object does not need this
 		g.writeln('\tbuiltin_init();')
 	}
diff --git a/vlib/v/markused/markused.v b/vlib/v/markused/markused.v
@@ -81,7 +81,7 @@ pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&a
 			core_fns << ref_array_idx_str + '.push'
 			core_fns << ref_array_idx_str + '.pop'
 		}
-		if table.used_features.used_modules.len > 0 {
+		if table.used_features.external_types {
 			include_panic_deps = true
 		}
 		if pref_.autofree {
@@ -289,7 +289,7 @@ pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&a
 			if table.used_features.auto_str || table.used_features.dump
 				|| table.used_features.print_types[mfn.receiver.typ.idx()]
 				|| table.used_features.asserts || table.used_features.debugger
-				|| table.used_features.used_modules.len > 0 {
+				|| table.used_features.external_types {
 				all_fn_root_names << k
 			}
 			continue
@@ -298,7 +298,7 @@ pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&a
 			all_fn_root_names << k
 			continue
 		}
-		if (pref_.autofree || table.used_features.used_modules.len > 0) && k.ends_with('.free') {
+		if (pref_.autofree || table.used_features.external_types) && k.ends_with('.free') {
 			all_fn_root_names << k
 			continue
 		}
diff --git a/vlib/v/tests/skip_unused/ierror_str.run.out b/vlib/v/tests/skip_unused/ierror_str.run.out
@@ -0,0 +1 @@
+No such file or directory; code: 2
diff --git a/vlib/v/tests/skip_unused/ierror_str.skip_unused.run.out b/vlib/v/tests/skip_unused/ierror_str.skip_unused.run.out
@@ -0,0 +1 @@
+No such file or directory; code: 2
diff --git a/vlib/v/tests/skip_unused/ierror_str.vv b/vlib/v/tests/skip_unused/ierror_str.vv
@@ -0,0 +1,6 @@
+import os
+
+fn main() {
+	mut proc := os.Process{}
+	proc.run()
+}

Original file line number	Diff line number	Diff line change
`@@ -4004,7 +4004,7 @@ fn (mut c Checker) ident(mut node ast.Ident) ast.Type {`
`4004`	`4004`	`node.pos)`
`4005`	`4005`	`}`
`4006`	`4006`	`if c.pref.skip_unused && !c.is_builtin_mod && node.language == .v && node.name.contains('.') {`
`4007`		`- c.table.used_features.used_modules[node.name.all_before('.')] = true`
	`4007`	`+ c.table.used_features.external_types = true`
`4008`	`4008`	`}`
`4009`	`4009`	`if mut obj := node.scope.find(node.name) {`
`4010`	`4010`	`match mut obj {`
Original file line number	Diff line number	Diff line change
`@@ -761,15 +761,14 @@ fn (mut c Checker) call_expr(mut node ast.CallExpr) ast.Type {`
`761`	`761`	`}`
`762`	`762`	`}`
`763`	`763`	`c.expected_or_type = old_expected_or_type`
`764`		`- if c.pref.skip_unused && !c.is_builtin_mod && c.mod == 'main' {`
	`764`	`+ if c.pref.skip_unused && !c.is_builtin_mod && c.mod == 'main'`
	`765`	`+ && !c.table.used_features.external_types {`
`765`	`766`	`if node.is_method {`
`766`		`- type_str := c.table.type_to_str(node.left_type)`
`767`		`- if c.table.sym(node.left_type).is_builtin()`
`768`		`- && type_str !in c.table.used_features.used_modules {`
`769`		`- c.table.used_features.used_modules[type_str] = true`
	`767`	`+ if c.table.sym(node.left_type).is_builtin() {`
	`768`	`+ c.table.used_features.external_types = true`
`770`	`769`	`}`
`771`	`770`	`} else if node.name.contains('.') {`
`772`		`- c.table.used_features.used_modules[node.name.all_before('.')] = true`
	`771`	`+ c.table.used_features.external_types = true`
`773`	`772`	`}`
`774`	`773`	`}`
`775`	`774`
Original file line number	Diff line number	Diff line change
`@@ -443,6 +443,10 @@ fn (mut c Checker) struct_init(mut node ast.StructInit, is_field_zero_struct_ini`
`443`	`443`	`node.typ = c.expected_type`
`444`	`444`	`}`
`445`	`445`	`}`
	`446`	`+ if c.pref.skip_unused && !c.is_builtin_mod && !c.table.used_features.external_types {`
	`447`	`+ type_str := c.table.type_to_str(node.typ)`
	`448`	`+ c.table.used_features.external_types = type_str.contains('.') && type_str.len > 1`
	`449`	`+ }`
`446`	`450`	`struct_sym := c.table.sym(node.typ)`
`447`	`451`	`mut old_inside_generic_struct_init := false`
`448`	`452`	`mut old_cur_struct_generic_types := []ast.Type{}`
Original file line number	Diff line number	Diff line change
`@@ -6169,7 +6169,7 @@ fn (mut g Gen) write_init_function() {`
`6169`	`6169`	`g.write('\tas_cast_type_indexes = ')`
`6170`	`6170`	`g.writeln(g.as_cast_name_table())`
`6171`	`6171`	`}`
`6172`		`- if !g.pref.is_shared && (!g.pref.skip_unused \|\| g.table.used_features.used_modules.len > 0) {`
	`6172`	`+ if !g.pref.is_shared && (!g.pref.skip_unused \|\| g.table.used_features.external_types) {`
`6173`	`6173`	`// shared object does not need this`
`6174`	`6174`	`g.writeln('\tbuiltin_init();')`
`6175`	`6175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&a`
`81`	`81`	`core_fns << ref_array_idx_str + '.push'`
`82`	`82`	`core_fns << ref_array_idx_str + '.pop'`
`83`	`83`	`}`
`84`		`- if table.used_features.used_modules.len > 0 {`
	`84`	`+ if table.used_features.external_types {`
`85`	`85`	`include_panic_deps = true`
`86`	`86`	`}`
`87`	`87`	`if pref_.autofree {`
`@@ -289,7 +289,7 @@ pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&a`
`289`	`289`	`if table.used_features.auto_str \|\| table.used_features.dump`
`290`	`290`	`\|\| table.used_features.print_types[mfn.receiver.typ.idx()]`
`291`	`291`	`\|\| table.used_features.asserts \|\| table.used_features.debugger`
`292`		`- \|\| table.used_features.used_modules.len > 0 {`
	`292`	`+ \|\| table.used_features.external_types {`
`293`	`293`	`all_fn_root_names << k`
`294`	`294`	`}`
`295`	`295`	`continue`
`@@ -298,7 +298,7 @@ pub fn mark_used(mut table ast.Table, mut pref_ pref.Preferences, ast_files []&a`
`298`	`298`	`all_fn_root_names << k`
`299`	`299`	`continue`
`300`	`300`	`}`
`301`		`- if (pref_.autofree \|\| table.used_features.used_modules.len > 0) && k.ends_with('.free') {`
	`301`	`+ if (pref_.autofree \|\| table.used_features.external_types) && k.ends_with('.free') {`
`302`	`302`	`all_fn_root_names << k`
`303`	`303`	`continue`
`304`	`304`	`}`