fix remaining master CI regressions

Author: medvednikov

cmd/tools/vtest-self.v

@@ -295,6 +295,7 @@ const skip_on_ubuntu_musl = [
 	'vlib/orm/orm_serial_attribute_test.v',
 	'vlib/orm/orm_option_subselect_test.v',
 	'vlib/orm/orm_func_test.v',
+	'vlib/orm/orm_module_table_prefix/orm_module_table_prefix_test.v',
 	'vlib/orm/orm_where_in_test.v',
 	'vlib/sokol/gfx/gfx_test.v', // sokol_app.h needs GL/gl.h, not installed in the musl Docker image
 	'vlib/v/gen/c/sql_assert_temp_var_test.v', // sqlite header dependency pulls in glibc sys/cdefs.h on musl-gcc

vlib/db/pg/pg_escape_literal_test.v

@@ -1,3 +1,4 @@
+// vtest build: started_postgres?
 module main
 
 import db.pg

vlib/io/buffered_reader_test.v

@@ -244,7 +244,9 @@ fn test_read_handles_eof_with_unread_data() {
 }
 
 fn test_read_line_handles_eof_with_unread_data() {
-	b := rand.bytes(8)!
+	// Keep the payload delimiter-free; random bytes can contain `\n` and make
+	// read_line correctly return a shorter first line.
+	b := 'abcdefgh'.bytes()
 	data := arrays.concat(b, `\n`)
 	mut br := new_one_byte_buffered_reader(data, 16)
 	mut p := br.peek(10)!

vlib/sync/mutex_zero_value_darwin_test.c.v

@@ -1,3 +1,4 @@
+// vtest build: macos
 import sync
 
 struct MutexHolder {

vlib/v/gen/c/cgen.v

@@ -13632,6 +13632,11 @@ fn (mut g Gen) type_default_impl(typ_ ast.Type, decode_sumtype bool) string {
 			return '{0}'
 		}
 		.thread {
+			// Windows uses a struct for typed thread handles, while untyped Windows
+			// handles and POSIX pthread_t values are scalar types.
+			if g.pref.os == .windows && g.styp(typ) != '__v_thread' {
+				return '{0}'
+			}
 			return '0'
 		}
 		.alias {

vlib/v/gen/c/struct.v

@@ -1297,7 +1297,18 @@ fn (mut g Gen) struct_init_field_default(field_unwrap_typ ast.Type, sfield &ast.
 
 	if sfield.expected_type.has_flag(.option) && field_unwrap_typ.has_flag(.option)
 		&& g.styp(sfield.expected_type) != g.styp(field_unwrap_typ) {
-		g.expr_opt_with_cast(sfield.expr, field_unwrap_typ, sfield.expected_type)
+		expr_base_typ := g.table.unaliased_type(field_unwrap_typ.clear_flag(.option))
+		expected_base_typ := g.table.unaliased_type(sfield.expected_type.clear_flag(.option))
+		expr_base_sym := g.table.final_sym(expr_base_typ)
+		expected_base_sym := g.table.final_sym(expected_base_typ)
+		if expr_base_typ == expected_base_typ
+			|| (expr_base_sym.kind == .function && expected_base_sym.kind == .function) {
+			// Alias-equivalent payloads have the same representation. Clone the complete
+			// option so `none` and error state are preserved along with the payload.
+			g.expr_opt_with_alias(sfield.expr, field_unwrap_typ, sfield.expected_type)
+		} else {
+			g.expr_opt_with_cast(sfield.expr, field_unwrap_typ, sfield.expected_type)
+		}
 	} else if (sfield.expected_type.has_flag(.option) && !field_unwrap_typ.has_flag(.option))
 		|| (sfield.expected_type.has_flag(.result) && !field_unwrap_typ.has_flag(.result)) {
 		g.expr_with_opt(sfield.expr, field_unwrap_typ, sfield.expected_type)

vlib/v/tests/gnu_make_tcc_fallback_test.v

@@ -140,6 +140,7 @@ printf "%s\\n" "\$*" >> ${os.quoted_path(rsync_trace)}
 archive=0
 delete_destination=0
 exclude_root_github=0
+exclude_root_git=0
 while [ "\$#" -gt 0 ]; do
 	case "\$1" in
 		-a)
@@ -154,6 +155,10 @@ while [ "\$#" -gt 0 ]; do
 			exclude_root_github=1
 			shift
 			;;
+		--exclude=/.git|--exclude=/.git/)
+			exclude_root_git=1
+			shift
+			;;
 		--)
 			shift
 			break
@@ -195,12 +200,12 @@ for source_path in "\$@"; do
 	case "\$source_path" in
 		*/)
 			mkdir -p -- "\$destination_path"
-			if [ "\$exclude_root_github" = 1 ]; then
+			if [ "\$exclude_root_github" = 1 ] || [ "\$exclude_root_git" = 1 ]; then
 				for source_entry in "\${source_path}".[!.]* "\${source_path}"..?* "\${source_path}"*; do
 					if [ ! -e "\$source_entry" ] && [ ! -L "\$source_entry" ]; then
 						continue
 					fi
-					if [ "\${source_entry##*/}" = ".github" ]; then
+					if { [ "\$exclude_root_github" = 1 ] && [ "\${source_entry##*/}" = ".github" ]; } || { [ "\$exclude_root_git" = 1 ] && [ "\${source_entry##*/}" = ".git" ]; }; then
 						continue
 					fi
 					cp -a -- "\$source_entry" "\$destination_path/"
@@ -254,14 +259,16 @@ fi
 		assert trace_lines[i].starts_with('${option_prefix}${operation}'), trace_lines.str()
 	}
 	rsync_lines := (os.read_file(rsync_trace) or { panic(err) }).trim_space().split_into_lines()
-	assert rsync_lines.len == 7, rsync_lines.str()
-	assert rsync_lines[0].starts_with('-a thirdparty/tcc/ '), rsync_lines.str()
-	assert rsync_lines[1].starts_with('-a --delete --exclude=/.github/ '), rsync_lines.str()
-	assert rsync_lines[2].contains('thirdparty/tcc.original/.git/'), rsync_lines.str()
-	assert rsync_lines[3].contains('thirdparty/tcc.original/lib/libgc'), rsync_lines.str()
-	assert rsync_lines[4].contains('thirdparty/tcc.original/lib/build'), rsync_lines.str()
-	assert rsync_lines[5].contains('thirdparty/tcc.original/README.md'), rsync_lines.str()
-	assert rsync_lines[6].ends_with('/build.sh'), rsync_lines.str()
+	assert rsync_lines.len == 8, rsync_lines.str()
+	assert rsync_lines[0].starts_with('-a --exclude=/.git --exclude=/.git/ thirdparty/tcc/ '), rsync_lines.str()
+
+	assert rsync_lines[1].starts_with('-a thirdparty/tcc/ '), rsync_lines.str()
+	assert rsync_lines[2].starts_with('-a --delete --exclude=/.github/ '), rsync_lines.str()
+	assert rsync_lines[3].contains('thirdparty/tcc.original/.git/'), rsync_lines.str()
+	assert rsync_lines[4].contains('thirdparty/tcc.original/lib/libgc'), rsync_lines.str()
+	assert rsync_lines[5].contains('thirdparty/tcc.original/lib/build'), rsync_lines.str()
+	assert rsync_lines[6].contains('thirdparty/tcc.original/README.md'), rsync_lines.str()
+	assert rsync_lines[7].ends_with('/build.sh'), rsync_lines.str()
 	assert os.execute('${os.quoted_path(os.join_path(tcc_dir, 'tcc.exe'))} --version').output.trim_space() == 'source-test-tcc'
 	staged_source_workflow := os.join_path(root, 'tinycc', 'thirdparty', 'tcc', '.github',
 		'workflows', 'preserve.yml')

vlib/v3/driver/driver.v

@@ -4426,9 +4426,16 @@ fn monomorph_cache_semantic_signature(a &flat.FlatAst, source_files []string) st
 			file_ids << idx
 		}
 	}
-	file_ids.sort_with_compare(fn [a] (left &int, right &int) int {
-		return a.nodes[*left].value.compare(a.nodes[*right].value)
-	})
+	// Keep the self-hosting path capture-free so V can be built with `-no-closures`.
+	for i in 1 .. file_ids.len {
+		value := file_ids[i]
+		mut j := i
+		for j > 0 && a.nodes[file_ids[j - 1]].value > a.nodes[value].value {
+			file_ids[j] = file_ids[j - 1]
+			j--
+		}
+		file_ids[j] = value
+	}
 	for idx in file_ids {
 		hash = c_hash_monomorph_node(hash, a, flat.NodeId(idx), cacheable_strings,
 			declaration_attributes)

vlib/v3/eval/eval.v

@@ -5974,7 +5974,6 @@ fn (e &Eval) sizeof_type_name(name string) i64 {
 		'bool', 'i8', 'u8', 'byte', 'char' { i64(1) }
 		'i16', 'u16' { i64(2) }
 		'int', 'i32', 'u32', 'rune', 'f32' { i64(4) }
-		'i64', 'u64', 'isize', 'usize', 'f64' { i64(8) }
 		else { i64(8) }
 	}
 }

vlib/v3/gen/c/cleanc.v

@@ -2730,18 +2730,22 @@ pub fn (mut g FlatGen) gen_with_used_options(a &flat.FlatAst, used_fns map[strin
 		mut parallel_iface_scan := false
 		mut iface_worker := &FlatGen{}
 		mut iface_threads := []thread voidptr{cap: 1}
-		$if !v3_no_parallel ? {
-			parallel_iface_scan = g.scope_parallel_workers && !effective_no_parallel
+		$if !windows {
+			$if !v3_no_parallel ? {
+				parallel_iface_scan = g.scope_parallel_workers && !effective_no_parallel
+			}
 		}
 		if parallel_iface_scan {
-			$if !v3_no_parallel ? {
-				iface_worker = g.new_parallel_worker(4)
-				iface_worker.interface_boxed_types = map[string]bool{}
-				iface_worker.interface_boxed_types_done = false
-				iface_worker.iface_impls = map[string][]string{}
-				iface_worker.iface_type_ids = map[string]int{}
-				iface_worker.ierror_method_emit_names = map[string]bool{}
-				iface_threads << spawn interface_impl_scan_thread(voidptr(iface_worker))
+			$if !windows {
+				$if !v3_no_parallel ? {
+					iface_worker = g.new_parallel_worker(4)
+					iface_worker.interface_boxed_types = map[string]bool{}
+					iface_worker.interface_boxed_types_done = false
+					iface_worker.iface_impls = map[string][]string{}
+					iface_worker.iface_type_ids = map[string]int{}
+					iface_worker.ierror_method_emit_names = map[string]bool{}
+					iface_threads << spawn interface_impl_scan_thread(voidptr(iface_worker))
+				}
 			}
 		} else {
 			g.collect_interface_impls()
@@ -2767,12 +2771,14 @@ pub fn (mut g FlatGen) gen_with_used_options(a &flat.FlatAst, used_fns map[strin
 		g.timing_profile('  [ttime]   cg preseeds      ${f64(cgsw.elapsed().microseconds()) / 1000.0:7.2f} ms')
 		cgsw.restart()
 		if parallel_iface_scan {
-			$if !v3_no_parallel ? {
-				_ = iface_threads[0].wait()
-				g.publish_interface_impl_scan(mut iface_worker)
-				g.precompute_required_interface_dispatch_methods()
-				g.timing_profile('  [ttime]   cg iface wait    ${f64(cgsw.elapsed().microseconds()) / 1000.0:7.2f} ms (overlapped)')
-				cgsw.restart()
+			$if !windows {
+				$if !v3_no_parallel ? {
+					_ = iface_threads[0].wait()
+					g.publish_interface_impl_scan(mut iface_worker)
+					g.precompute_required_interface_dispatch_methods()
+					g.timing_profile('  [ttime]   cg iface wait    ${f64(cgsw.elapsed().microseconds()) / 1000.0:7.2f} ms (overlapped)')
+					cgsw.restart()
+				}
 			}
 		}
 		parallel_prep_done := g.run_pre_dispatch_parallel(effective_no_parallel)
@@ -3122,7 +3128,7 @@ fn (mut g FlatGen) gen_global_declaration_block() {
 fn (mut g FlatGen) gen_type_declaration_block() {
 	g.enum_decls()
 	g.type_forward_decls()
-	g.type_alias_decls()
+	g.type_alias_decls(false)
 	// Forward-declare multi-return structs before fn-ptr typedefs, which may name a
 	// multi-return as a by-value return type (full bodies come after struct_decls).
 	g.multi_return_forward_decls()
@@ -3131,6 +3137,7 @@ fn (mut g FlatGen) gen_type_declaration_block() {
 	// array in param or return position) and the function declarations.
 	g.fixed_array_early_typedefs()
 	g.fn_ptr_typedefs()
+	g.type_alias_decls(true)
 	g.struct_decls()
 	g.fixed_array_typedefs()
 	g.multi_return_typedefs()