ci: fix macOS V3 rollout failures

Author: medvednikov

ci/freebsd_ci.vsh

@@ -63,7 +63,7 @@ fn build_fast_script() {
 	} else {
 		println('### Build fast script')
 	}
-	exec('cd cmd/tools/fast && v fast.v')
+	exec('cd cmd/tools/fast && v -o fast .')
 	if common.is_github_job {
 		println('::endgroup::')
 	}

ci/linux_ci.vsh

@@ -128,8 +128,8 @@ fn test_v_tutorials_tcc() {
 }
 
 fn build_fast_tcc() {
-	exec('cd cmd/tools/fast && v fast.v')
-	exec('cd cmd/tools/fast && ./fast')
+	exec('cd cmd/tools/fast && v -o fast .')
+	exec('cd cmd/tools/fast && ./fast help')
 }
 
 fn v_self_compilation_usecache_tcc() {

ci/openbsd_ci.vsh

@@ -63,7 +63,7 @@ fn build_fast_script() {
 	} else {
 		println('### Build fast script')
 	}
-	exec('cd cmd/tools/fast && v fast.v')
+	exec('cd cmd/tools/fast && v -o fast .')
 	if common.is_github_job {
 		println('::endgroup::')
 	}

cmd/tools/vbuild-tools.v

@@ -11,7 +11,7 @@ import v.util
 // should be compiled (v folder).
 // To implement that, these folders are initially skipped, then added
 // as a whole *after the testing.prepare_test_session call*.
-const tools_in_subfolders = ['vast', 'vcreate', 'vdoc', 'vpm', 'vsqlite', 'vsymlink', 'vvet',
+const tools_in_subfolders = ['fast', 'vast', 'vcreate', 'vdoc', 'vpm', 'vsqlite', 'vsymlink', 'vvet',
 	'vwhere', 'vcover']
 
 // v2 is temporarily disabled, so tools that depend on it are skipped too.

cmd/v/macos_v3_darwin.c.v

@@ -56,16 +56,14 @@ fn is_macos_v3_relevant_command(command string, prefs &pref.Preferences) bool {
 	}
 	normalized_path := prefs.path.replace('\\', '/').trim_right('/')
 	is_directory := os.is_dir(prefs.path)
-	is_direct_vsh := normalized_path.ends_with('.vsh') && command != 'crun'
 	if command in external_tools
 		|| command in ['help', 'version', 'new', 'init', 'install', 'link', 'list', 'outdated', 'remove', 'search', 'show', 'unlink', 'update', 'upgrade', 'vlib-docs', 'interpret', 'get', 'translate'] {
 		return false
 	}
-	if (prefs.is_crun && !is_direct_vsh) || prefs.is_test || prefs.is_prod
-		|| prefs.autofree || prefs.build_mode == .build_module || prefs.is_cstrict
-		|| prefs.use_cache || prefs.parallel_cc || prefs.out_name_is_dir
-		|| prefs.exclude.len > 0 || prefs.coverage_dir != '' || prefs.is_o
-		|| prefs.is_vlines || prefs.is_shared {
+	if prefs.is_crun || prefs.is_test || prefs.is_prod || prefs.autofree
+		|| prefs.build_mode == .build_module || prefs.is_cstrict || prefs.use_cache
+		|| prefs.parallel_cc || prefs.out_name_is_dir || prefs.exclude.len > 0
+		|| prefs.coverage_dir != '' || prefs.is_o || prefs.is_vlines || prefs.is_shared {
 		return false
 	}
 	// The established preference defaults select Boehm before dispatch runs,
@@ -291,9 +289,11 @@ fn retry_macos_v3_with_old_compiler(caller_environment map[string]string, fallba
 			return
 		}
 		os.setenv(macos_v3_c_error_dir_env, c_error_dir, true)
-		eprintln('V3 C compilation failed; retrying with `-old-compiler`.')
-		if report.c_output != '' {
-			eprintln(report.c_output.trim_right('\r\n'))
+		if is_verbose {
+			eprintln('V3 C compilation failed; retrying with `-old-compiler`.')
+			if report.c_output != '' {
+				eprintln(report.c_output.trim_right('\r\n'))
+			}
 		}
 	} else {
 		os.rmdir_all(c_error_dir) or {}
@@ -302,7 +302,9 @@ fn retry_macos_v3_with_old_compiler(caller_environment map[string]string, fallba
 				println('V3 requested the compatibility compiler for inline assembly')
 			}
 		} else {
-			eprintln('V3 compilation failed; retrying with `-old-compiler`.')
+			if is_verbose {
+				eprintln('V3 compilation failed; retrying with `-old-compiler`.')
+			}
 		}
 	}
 	os.setenv(macos_v3_retry_env, '1', true)

cmd/v/macos_v3_test.v

@@ -81,7 +81,7 @@ fn test_macos_v3_relevant_command_only_selects_supported_native_c_builds() {
 		assert !is_macos_v3_relevant_command('build', prefs)
 		prefs.path = 'script.vsh'
 		prefs.is_crun = true
-		assert is_macos_v3_relevant_command('script.vsh', prefs)
+		assert !is_macos_v3_relevant_command('script.vsh', prefs)
 		assert !is_macos_v3_relevant_command('crun', prefs)
 		prefs.is_crun = false
 		prefs.path = 'main.v'
@@ -324,7 +324,8 @@ fn main() {}
 		failing_exit_code := failing_process.code
 		failing_process.close()
 		assert failing_exit_code != 0, failing_output_text
-		assert failing_output_text.contains('V3 C compilation failed; retrying with `-old-compiler`.')
+		assert !failing_output_text.contains('V3 C compilation failed; retrying with `-old-compiler`.')
+		assert failing_output_text.contains('macos_v3_missing_library_')
 		failing_report_dir := os.join_path(os.vtmp_dir(),
 			'macos_v3_fallback_${failing_compiler_pid}.c_error')
 		assert !os.exists(failing_report_dir), 'failed compatibility build left staged report directory: ${failing_report_dir}'

vlib/v/pref/pref_test.v

@@ -31,7 +31,7 @@ fn test_version_flag() {
 	v_verbose_cmd_res := os.execute_opt('${vexe} -v run ${example_path}')!.output
 	assert v_verbose_cmd_res != v_ver_cmd_res
 	assert v_verbose_cmd_res.contains('v.pref.lookup_path:')
-		|| v_verbose_cmd_res.contains('Launching macOS V3 compiler:')
+		|| v_verbose_cmd_res.contains('Running macOS V3 compiler in process:')
 
 	v_verbose_cmd_with_additional_args_res := os.execute_opt('${vexe} -g -v run ${example_path}')!.output
 	assert v_verbose_cmd_with_additional_args_res != v_ver_cmd_res

vlib/v3/driver/driver.v

@@ -1605,7 +1605,8 @@ fn input_is_cmd_v(input_file string) bool {
 
 fn default_bin_file_for_input(input_file string) string {
 	if os.is_dir(input_file) {
-		return os.base(os.real_path(input_file))
+		real_input := os.real_path(input_file)
+		return os.join_path_single(real_input, os.base(real_input))
 	}
 	if input_file.ends_with('.vv') {
 		return input_file.all_before_last('.vv')
@@ -4434,6 +4435,9 @@ pub fn run(args []string) {
 		if request_macos_v3_compatibility_fallback(p.diagnostics, macos_v3_fallback_file) {
 			exit(1)
 		}
+		if macos_v3_fallback_file != '' {
+			exit(1)
+		}
 		for diagnostic in p.diagnostics {
 			if file := a.source_files[diagnostic.pos.id] {
 				_ = file
@@ -4754,7 +4758,9 @@ pub fn run(args []string) {
 			cvsw.restart()
 		}
 		if pre_tc.check_interface_embedding_limits() {
-			print_type_diagnostics(a, pre_tc.notices, pre_tc.errors, is_checker_fixture)
+			if macos_v3_fallback_file == '' {
+				print_type_diagnostics(a, pre_tc.notices, pre_tc.errors, is_checker_fixture)
+			}
 			exit(1)
 		}
 		if verbose {
@@ -4848,7 +4854,9 @@ pub fn run(args []string) {
 						fixture_used_fns, false)
 				}
 			}
-			print_type_diagnostics(a, pre_tc.notices, pre_tc.errors, is_checker_fixture)
+			if macos_v3_fallback_file == '' {
+				print_type_diagnostics(a, pre_tc.notices, pre_tc.errors, is_checker_fixture)
+			}
 			pre_tc.notices.clear()
 		}
 		if pre_tc.errors.len > 0 {
@@ -5265,6 +5273,9 @@ pub fn run(args []string) {
 		b.step('annotate types (cached)')
 	}
 	if pre_tc.errors.len > 0 {
+		if macos_v3_fallback_file != '' {
+			exit(1)
+		}
 		print_type_diagnostics(a, pre_tc.notices, pre_tc.errors, is_checker_fixture)
 		exit(1)
 	}
@@ -5411,7 +5422,9 @@ pub fn run(args []string) {
 			used_fns = monomorph_used_fns.move()
 		}
 		if pre_tc.notices.len > 0 || pre_tc.errors.len > 0 {
-			print_type_diagnostics(a, pre_tc.notices, pre_tc.errors, is_checker_fixture)
+			if pre_tc.errors.len == 0 || macos_v3_fallback_file == '' {
+				print_type_diagnostics(a, pre_tc.notices, pre_tc.errors, is_checker_fixture)
+			}
 			pre_tc.notices.clear()
 		}
 		if pre_tc.errors.len > 0 {

vlib/v3/pthread_helper.h

@@ -9,6 +9,10 @@
  * declaration used only by the helper available after includes are flattened. */
 extern int pthread_attr_setstacksize(pthread_attr_t *attr, size_t stack_size);
 
+static inline pthread_t v3_pthread_zero(void) {
+	return (pthread_t)0;
+}
+
 static inline int v3_pthread_create(pthread_t *thread, size_t stack_size,
 	void *(*start_routine)(void *), void *arg) {
 	pthread_attr_t attr;

vlib/v3/workers/worker_pool_nix.c.v

@@ -71,6 +71,7 @@ struct Completion {
 struct C.pthread_t {}
 
 fn C.pthread_join(thread C.pthread_t, retval voidptr) int
+fn C.v3_pthread_zero() C.pthread_t
 fn C.v3_pthread_create(thread &C.pthread_t, stack_size usize, start_routine fn (voidptr) voidptr, arg voidptr) int
 
 // Pool owns a bounded set of persistent compiler workers. Phase payloads stay
@@ -133,7 +134,7 @@ pub fn new(size int) &Pool {
 	fail := os.getenv('V3_TEST_PTHREAD_CREATE_FAIL')
 	stack_size := worker_stack_size()
 	for idx in 0 .. wanted {
-		mut thread_id := C.pthread_t{}
+		mut thread_id := C.v3_pthread_zero()
 		result := if fail == 'pool:all' || fail == 'pool:${idx}' {
 			11
 		} else {