Merge remote-tracking branch 'origin/master' into v3-default-linux-fallback-reports

# Conflicts:
#	cmd/v/macos_v3_args.c.v
#	cmd/v/macos_v3_darwin.c.v
#	vlib/v3/transform/transform_parallel_notd_v3_no_parallel.v

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

cmd/v/macos_v3_args.c.v

@@ -19,6 +19,27 @@ fn macos_v3_non_compilation_command(command string) bool {
 		'interpret', 'get', 'translate']
 }
 
+// is_macos_v3_compiler_bootstrap reports whether `normalized_path` targets the
+// `vlib/v3/v3.v` compiler bootstrap, which must build with the compatibility
+// compiler rather than the embedded V3 driver. It matches the repo-relative path
+// and any path ending in it, and also resolves a bare `v3.v` (for example when
+// invoked from inside `vlib/v3`) through its real path, so the bootstrap is
+// recognized regardless of the working directory. Both dispatch gates rely on
+// it, so keep the detection in one place to stop them drifting.
+@[markused]
+fn is_macos_v3_compiler_bootstrap(normalized_path string) bool {
+	if normalized_path == 'vlib/v3/v3.v' || normalized_path.ends_with('/vlib/v3/v3.v') {
+		return true
+	}
+	// Only a file literally named `v3.v` can be the bootstrap; skip the real-path
+	// resolution (a filesystem lookup) for every other compilation target.
+	if os.base(normalized_path) != 'v3.v' {
+		return false
+	}
+	real_path := os.real_path(normalized_path).replace('\\', '/').trim_right('/')
+	return real_path == 'vlib/v3/v3.v' || real_path.ends_with('/vlib/v3/v3.v')
+}
+
 // macos_v3_force_requested reports whether `-new-compiler` should hand this
 // invocation to the embedded V3 compiler. It gates on `-old-compiler`
 // precedence, options/modes V3 cannot honor yet, and whether the command is an
@@ -53,7 +74,7 @@ fn macos_v3_explicit_compilation_requested(command string, prefs &pref.Preferenc
 	}
 	normalized_path := prefs.path.replace('\\', '/').trim_right('/')
 	if is_macos_v3_vroot_path(normalized_path, 'cmd/v', true)
-		|| is_macos_v3_vroot_path(normalized_path, 'vlib/v3/v3.v', false) {
+		|| is_macos_v3_compiler_bootstrap(normalized_path) {
 		return false
 	}
 	return command in ['run', 'build'] || prefs.is_script || os.is_dir(prefs.path)

cmd/v/macos_v3_test.v

@@ -243,6 +243,47 @@ fn test_macos_v3_relevant_command_selects_user_compilation_and_tests() {
 	}
 }
 
+fn test_macos_v3_compiler_bootstrap_is_detected_from_any_cwd() {
+	// Repo-relative and absolute spellings are recognized directly.
+	assert is_macos_v3_compiler_bootstrap('vlib/v3/v3.v')
+	assert is_macos_v3_compiler_bootstrap('/home/user/v/vlib/v3/v3.v')
+	// Non-bootstrap targets stay on the V3 path.
+	assert !is_macos_v3_compiler_bootstrap('main.v')
+	assert !is_macos_v3_compiler_bootstrap('cmd/v')
+	assert !is_macos_v3_compiler_bootstrap('some/other/place/v3.v')
+
+	// A bare `v3.v` invoked from inside vlib/v3 must resolve to the bootstrap so
+	// it builds with the compatibility compiler instead of the embedded V3 driver.
+	// Use an isolated <tmp>/vlib/v3/v3.v so this exercises the real-path
+	// resolution unconditionally, independent of where this test file lives.
+	root := os.join_path(os.real_path(os.vtmp_dir()), 'macos_v3_bootstrap_${os.getpid()}')
+	v3_dir := os.join_path(root, 'vlib', 'v3')
+	other_dir := os.join_path(root, 'elsewhere')
+	os.rmdir_all(root) or {}
+	os.mkdir_all(v3_dir) or { panic(err) }
+	os.mkdir_all(other_dir) or { panic(err) }
+	defer {
+		os.rmdir_all(root) or {}
+	}
+	os.write_file(os.join_path(v3_dir, 'v3.v'), 'module main\n') or { panic(err) }
+	os.write_file(os.join_path(other_dir, 'v3.v'), 'module main\n') or { panic(err) }
+
+	saved := os.getwd()
+	defer {
+		os.chdir(saved) or {}
+	}
+	os.chdir(v3_dir) or { panic(err) }
+	bare := is_macos_v3_compiler_bootstrap('v3.v')
+	dotted := is_macos_v3_compiler_bootstrap('./v3.v')
+	// A bare `v3.v` that is not under vlib/v3 must stay on the V3 path.
+	os.chdir(other_dir) or { panic(err) }
+	non_bootstrap := is_macos_v3_compiler_bootstrap('v3.v')
+	os.chdir(saved) or {}
+	assert bare
+	assert dotted
+	assert !non_bootstrap
+}
+
 fn test_macos_v3_dispatch_allows_the_implicit_gc_default() {
 	$if macos {
 		implicit_gc, _ := pref.parse_args_and_show_errors([], ['', 'main.v'], false)

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

@@ -4457,9 +4457,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)